[llvm-commits] [llvm-gcc-4.2] r105662 - in /llvm-gcc-4.2/trunk/extras: build-4-mingw32 build-x-4-mingw32 buildbot-launcher
Galina Kistanova
gkistanova at gmail.com
Tue Jun 8 16:55:21 PDT 2010
Author: gkistanova
Date: Tue Jun 8 18:55:21 2010
New Revision: 105662
URL: http://llvm.org/viewvc/llvm-project?rev=105662&view=rev
Log:
Cosmetic changes
Modified:
llvm-gcc-4.2/trunk/extras/build-4-mingw32
llvm-gcc-4.2/trunk/extras/build-x-4-mingw32
llvm-gcc-4.2/trunk/extras/buildbot-launcher
Modified: llvm-gcc-4.2/trunk/extras/build-4-mingw32
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/extras/build-4-mingw32?rev=105662&r1=105661&r2=105662&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/extras/build-4-mingw32 (original)
+++ llvm-gcc-4.2/trunk/extras/build-4-mingw32 Tue Jun 8 18:55:21 2010
@@ -106,7 +106,7 @@
#------------------------------------------------------------------------------
if [ "$do_configure_llvm" == "yes" ] ; then
- # Remove previous build files if any.
+ # Remove previously build files if any.
rm -rf ${BUILD_ROOT}/${LLVM_obj}
mkdir -p ${BUILD_ROOT}/${LLVM_obj}
chmod a+rx ${BUILD_ROOT}/${LLVM_obj}
@@ -147,7 +147,7 @@
#------------------------------------------------------------------------------
if [ "$do_configure_llvmgcc" == "yes" ] ; then
- # Remove previous build files if any.
+ # Remove previously build files if any.
rm -rf ${BUILD_ROOT}/${LLVM_GCC_obj}
mkdir -p ${BUILD_ROOT}/${LLVM_GCC_obj}
chmod a+rx ${BUILD_ROOT}/${LLVM_GCC_obj}
Modified: llvm-gcc-4.2/trunk/extras/build-x-4-mingw32
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/extras/build-x-4-mingw32?rev=105662&r1=105661&r2=105662&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/extras/build-x-4-mingw32 (original)
+++ llvm-gcc-4.2/trunk/extras/build-x-4-mingw32 Tue Jun 8 18:55:21 2010
@@ -44,10 +44,11 @@
# This script supports the following steps:
do_clean=no # Clean up the build directory.
+do_copy_cross_tools=no # Copy cross-tools.
do_configure_llvm=no # Configure LLVM.
do_make_llvm=no # Make LLVM.
do_test_llvm=no # Test LLVM.
-do_cross_tools=no # Copy cross-tools.
+do_cross_tools=no # Copy cross-tools. Deprecated. Use copy_cross_tools instead.
do_configure_llvmgcc=no # Configure LLVM-GCC.
do_make_llvmgcc=no # Make LLVM-GCC.
do_install_llvmgcc=no # Install LLVM-GCC.
@@ -62,6 +63,7 @@
# First check that the parameter actually defines a step.
case $1 in
clean | \
+ copy_cross_tools | \
configure_llvm | \
make_llvm | \
test_llvm | \
@@ -83,15 +85,20 @@
if [ "$do_all" == "yes" ] ; then
# Set all steps to yes
do_clean=yes
+ do_copy_cross_tools=yes
do_configure_llvm=yes
do_make_llvm=yes
do_test_llvm=yes
- do_cross_tools=yes
do_configure_llvmgcc=yes
do_make_llvmgcc=yes
do_install_llvmgcc=yes
fi
+# Handle deprecated steps.
+if [ "$do_cross_tools" == "yes" ] ; then
+ do_copy_cross_tools=yes
+fi
+
#------------------------------------------------------------------------------
# Step: Clean up.
#------------------------------------------------------------------------------
@@ -105,11 +112,22 @@
fi
#------------------------------------------------------------------------------
+# Step: Copy cross-tools.
+#------------------------------------------------------------------------------
+if [ "$do_copy_cross_tools" == "yes" ] ; then
+
+ # We need a local copy of binutils, system libraries and headers,
+ # since we will be installing there.
+ cp -RL /cross-tools/ ${PRIVATE_INSTALL}
+
+fi
+
+#------------------------------------------------------------------------------
# Step: Configure LLVM.
#------------------------------------------------------------------------------
if [ "$do_configure_llvm" == "yes" ] ; then
- # Remove previous build files if any.
+ # Remove previously build files if any.
rm -rf ${BUILD_ROOT}/${LLVM_obj}
mkdir -p ${BUILD_ROOT}/${LLVM_obj}
chmod a+rx ${BUILD_ROOT}/${LLVM_obj}
@@ -119,7 +137,7 @@
--build=x86_64-apple-darwin10 --host=x86_64-apple-darwin10 \
--target=i686-pc-mingw32 \
--enable-optimize \
- --without-llvmgcc --without-llvmgxx \
+ --without-llvmgcc --without-llvmgxx \
$@ # Extra args if any
fi
@@ -148,22 +166,11 @@
fi
#------------------------------------------------------------------------------
-# Step: Copy cross-tools.
-#------------------------------------------------------------------------------
-if [ "$do_cross_tools" == "yes" ] ; then
-
- # We need a local copy of binutils, system libraries and headers,
- # since we will be installing there.
- cp -RL /cross-tools/ ${PRIVATE_INSTALL}
-
-fi
-
-#------------------------------------------------------------------------------
# Step: Configure LLVM-GCC.
#------------------------------------------------------------------------------
if [ "$do_configure_llvmgcc" == "yes" ] ; then
- # Remove previous build files if any.
+ # Remove previously build files if any.
rm -rf ${BUILD_ROOT}/${LLVM_GCC_obj}
mkdir -p ${BUILD_ROOT}/${LLVM_GCC_obj}
chmod a+rx ${BUILD_ROOT}/${LLVM_GCC_obj}
@@ -171,7 +178,7 @@
../${LLVM_GCC_src}/configure --prefix=${PRIVATE_INSTALL} \
--build=x86_64-apple-darwin10 --host=x86_64-apple-darwin10 \
- --with-local-prefix=/tools \
+ --with-local-prefix=/tools \
--target=i686-pc-mingw32 \
--program-prefix=i686-pc-mingw32- \
--enable-llvm=${BUILD_ROOT}/${LLVM_obj} \
Modified: llvm-gcc-4.2/trunk/extras/buildbot-launcher
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/extras/buildbot-launcher?rev=105662&r1=105661&r2=105662&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/extras/buildbot-launcher (original)
+++ llvm-gcc-4.2/trunk/extras/buildbot-launcher Tue Jun 8 18:55:21 2010
@@ -19,13 +19,12 @@
cd $BUILD_DIR
# The build script expects source code directories in certain place with
-# certain names.
-# TODO: Handle relative paths here
-if [ "$LLVM_SOURCE" != "llvm.src" ] ; then
- ln -sf $BUILD_DIR/$LLVM_SOURCE $BUILD_DIR/llvm.src
+# certain names. Create link only if target directory or link does not exist.
+if [ ! -d $BUILD_DIR/llvm.src ] ; then
+ ln -sf $LLVM_SOURCE $BUILD_DIR/llvm.src
fi
-if [ "$LLVM_GCC_SOURCE" != "llvm-gcc.src" ] ; then
- ln -sf $BUILD_DIR/$LLVM_GCC_SOURCE $BUILD_DIR/llvm-gcc.src
+if [ ! -d $BUILD_DIR/llvm-gcc.src ] ; then
+ ln -sf $LLVM_GCC_SOURCE $BUILD_DIR/llvm-gcc.src
fi
# Launch the build script with all the remaining parameters
More information about the llvm-commits
mailing list