diff options
| author | Hans Wennborg <hans@hanshq.net> | 2015-07-14 20:15:15 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2015-07-14 20:15:15 +0000 |
| commit | e1bb5354220459e7d441a240855f5f60c561003b (patch) | |
| tree | 13343978bdd1c8b38df496833cf38599e317b9ea /utils/release/test-release.sh | |
| parent | 2883bf35a60eba7dfec8172be76f32b829e37e8d (diff) | |
test-release.sh: Remove the InstallDir parameter from configure_llvmCore
After r242187, it's never set.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@242194 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/release/test-release.sh')
| -rwxr-xr-x | utils/release/test-release.sh | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/utils/release/test-release.sh b/utils/release/test-release.sh index ca81dcfd4aa..ee87b3f1987 100755 --- a/utils/release/test-release.sh +++ b/utils/release/test-release.sh @@ -231,7 +231,6 @@ function configure_llvmCore() { Phase="$1" Flavor="$2" ObjDir="$3" - InstallDir="$4" case $Flavor in Release | Release-64 ) @@ -253,13 +252,6 @@ function configure_llvmCore() { ;; esac - if [ -z "$InstallDir" ]; then - echo "Using default install prefix" - PrefixArg="" - else - PrefixArg="--prefix=$InstallDir" - fi - echo "# Using C compiler: $c_compiler" echo "# Using C++ compiler: $cxx_compiler" @@ -267,13 +259,13 @@ function configure_llvmCore() { cd $ObjDir echo "# Configuring llvm $Release-$RC $Flavor" - echo "# $BuildDir/llvm.src/configure $PrefixArg \ + echo "# $BuildDir/llvm.src/configure \ --enable-optimized=$Optimized \ --enable-assertions=$Assertions \ --disable-timestamps \ $build_triple_option" env CC="$c_compiler" CXX="$cxx_compiler" \ - $BuildDir/llvm.src/configure $PrefixArg \ + $BuildDir/llvm.src/configure \ --enable-optimized=$Optimized \ --enable-assertions=$Assertions \ --disable-timestamps \ @@ -418,8 +410,7 @@ for Flavor in $Flavors ; do ############################################################################ # Phase 1: Build llvmCore and clang echo "# Phase 1: Building llvmCore" - configure_llvmCore 1 $Flavor \ - $llvmCore_phase1_objdir "" + configure_llvmCore 1 $Flavor $llvmCore_phase1_objdir build_llvmCore 1 $Flavor \ $llvmCore_phase1_objdir $llvmCore_phase1_destdir clean_RPATH $llvmCore_phase1_destdir/usr/local @@ -429,8 +420,7 @@ for Flavor in $Flavors ; do c_compiler=$llvmCore_phase1_destdir/usr/local/bin/clang cxx_compiler=$llvmCore_phase1_destdir/usr/local/bin/clang++ echo "# Phase 2: Building llvmCore" - configure_llvmCore 2 $Flavor \ - $llvmCore_phase2_objdir "" + configure_llvmCore 2 $Flavor $llvmCore_phase2_objdir build_llvmCore 2 $Flavor \ $llvmCore_phase2_objdir $llvmCore_phase2_destdir clean_RPATH $llvmCore_phase2_destdir/usr/local @@ -440,8 +430,7 @@ for Flavor in $Flavors ; do c_compiler=$llvmCore_phase2_destdir/usr/local/bin/clang cxx_compiler=$llvmCore_phase2_destdir/usr/local/bin/clang++ echo "# Phase 3: Building llvmCore" - configure_llvmCore 3 $Flavor \ - $llvmCore_phase3_objdir "" + configure_llvmCore 3 $Flavor $llvmCore_phase3_objdir build_llvmCore 3 $Flavor \ $llvmCore_phase3_objdir $llvmCore_phase3_destdir clean_RPATH $llvmCore_phase3_destdir/usr/local |