[llvm-commits] [llvm-gcc-4.2] r124686 - /llvm-gcc-4.2/trunk/extras/build-x-4-mingw32
Galina Kistanova
gkistanova at gmail.com
Tue Feb 1 13:35:27 PST 2011
Author: gkistanova
Date: Tue Feb 1 15:35:27 2011
New Revision: 124686
URL: http://llvm.org/viewvc/llvm-project?rev=124686&view=rev
Log:
Some build script code cleaning and environment change for one of slave builders.
Modified:
llvm-gcc-4.2/trunk/extras/build-x-4-mingw32
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=124686&r1=124685&r2=124686&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/extras/build-x-4-mingw32 (original)
+++ llvm-gcc-4.2/trunk/extras/build-x-4-mingw32 Tue Feb 1 15:35:27 2011
@@ -38,6 +38,9 @@
BUILD_ROOT=$PWD # Where build happens.
PRIVATE_INSTALL=${BUILD_ROOT}/${INSTALL} # Where the result will be installed.
+export PATH=/opt/local/bin:/opt/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin
+export PATH=$PATH:/mingw_build_tools/install_with_gcc/bin
+
#------------------------------------------------------------------------------
# Define build steps, parse and validate input parameters
#------------------------------------------------------------------------------
@@ -48,7 +51,6 @@
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. 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.
@@ -67,13 +69,12 @@
configure_llvm | \
make_llvm | \
test_llvm | \
- cross_tools | \
configure_llvmgcc | \
make_llvmgcc | \
install_llvmgcc | \
all)
eval do_$1=yes # Set the flag for the requested step .
- shift # Remove it since is is ours and already precessed.
+ shift # Remove it since it is ours and already precessed.
;;
*)
@@ -94,11 +95,6 @@
do_install_llvmgcc=yes
fi
-# Handle deprecated steps.
-if [ "$do_cross_tools" == "yes" ] ; then
- do_copy_cross_tools=yes
-fi
-
#------------------------------------------------------------------------------
# Step: Clean up.
#------------------------------------------------------------------------------
@@ -118,7 +114,7 @@
# We need a local copy of binutils, system libraries and headers,
# since we will be installing there.
- cp -RL /cross-tools/ ${PRIVATE_INSTALL}
+ cp -RL /mingw_build_tools/install_with_gcc/ ${PRIVATE_INSTALL}
fi
More information about the llvm-commits
mailing list