llvm.org GIT mirror llvm / e1bb535
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 Hans Wennborg 4 years ago
1 changed file(s) with 5 addition(s) and 16 deletion(s). Raw diff Collapse all Expand all
230230 Phase="$1"
231231 Flavor="$2"
232232 ObjDir="$3"
233 InstallDir="$4"
234233
235234 case $Flavor in
236235 Release | Release-64 )
252251 ;;
253252 esac
254253
255 if [ -z "$InstallDir" ]; then
256 echo "Using default install prefix"
257 PrefixArg=""
258 else
259 PrefixArg="--prefix=$InstallDir"
260 fi
261
262254 echo "# Using C compiler: $c_compiler"
263255 echo "# Using C++ compiler: $cxx_compiler"
264256
266258
267259 cd $ObjDir
268260 echo "# Configuring llvm $Release-$RC $Flavor"
269 echo "# $BuildDir/llvm.src/configure $PrefixArg \
261 echo "# $BuildDir/llvm.src/configure \
270262 --enable-optimized=$Optimized \
271263 --enable-assertions=$Assertions \
272264 --disable-timestamps \
273265 $build_triple_option"
274266 env CC="$c_compiler" CXX="$cxx_compiler" \
275 $BuildDir/llvm.src/configure $PrefixArg \
267 $BuildDir/llvm.src/configure \
276268 --enable-optimized=$Optimized \
277269 --enable-assertions=$Assertions \
278270 --disable-timestamps \
417409 ############################################################################
418410 # Phase 1: Build llvmCore and clang
419411 echo "# Phase 1: Building llvmCore"
420 configure_llvmCore 1 $Flavor \
421 $llvmCore_phase1_objdir ""
412 configure_llvmCore 1 $Flavor $llvmCore_phase1_objdir
422413 build_llvmCore 1 $Flavor \
423414 $llvmCore_phase1_objdir $llvmCore_phase1_destdir
424415 clean_RPATH $llvmCore_phase1_destdir/usr/local
428419 c_compiler=$llvmCore_phase1_destdir/usr/local/bin/clang
429420 cxx_compiler=$llvmCore_phase1_destdir/usr/local/bin/clang++
430421 echo "# Phase 2: Building llvmCore"
431 configure_llvmCore 2 $Flavor \
432 $llvmCore_phase2_objdir ""
422 configure_llvmCore 2 $Flavor $llvmCore_phase2_objdir
433423 build_llvmCore 2 $Flavor \
434424 $llvmCore_phase2_objdir $llvmCore_phase2_destdir
435425 clean_RPATH $llvmCore_phase2_destdir/usr/local
439429 c_compiler=$llvmCore_phase2_destdir/usr/local/bin/clang
440430 cxx_compiler=$llvmCore_phase2_destdir/usr/local/bin/clang++
441431 echo "# Phase 3: Building llvmCore"
442 configure_llvmCore 3 $Flavor \
443 $llvmCore_phase3_objdir ""
432 configure_llvmCore 3 $Flavor $llvmCore_phase3_objdir
444433 build_llvmCore 3 $Flavor \
445434 $llvmCore_phase3_objdir $llvmCore_phase3_destdir
446435 clean_RPATH $llvmCore_phase3_destdir/usr/local