Patch to build llvm with srcdir != objdir from

llvm-top.  By Michael Schuerig, with some small
tweaks to make the "don't configure if already
configured" logic work.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@62842 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Duncan Sands 2009-01-23 08:42:38 +00:00
parent 95900f2dda
commit 2603580d47
2 changed files with 16 additions and 6 deletions

View File

@ -1,4 +1,4 @@
DepModule: DepModule:
BuildCmd: ./build-for-llvm-top.sh BuildCmd: ./build-for-llvm-top.sh
CleanCmd: make clean CleanCmd: make clean -C ../build.llvm
InstallCmd: make install InstallCmd: make install -C ../build.llvm

View File

@ -9,9 +9,16 @@
# variables. # variables.
process_arguments "$@" process_arguments "$@"
# First, see if the build directory is there. If not, create it.
build_dir="$LLVM_TOP/build.llvm"
if test ! -d "$build_dir" ; then
mkdir -p "$build_dir"
fi
# See if we have previously been configured by sensing the presence # See if we have previously been configured by sensing the presence
# of the config.status scripts # of the config.status scripts
if test ! -x "config.status" ; then config_status="$build_dir/config.status"
if test ! -f "$config_status" -o "$config_status" -ot "$0" ; then
# We must configure so build a list of configure options # We must configure so build a list of configure options
config_options="--prefix=$PREFIX --with-llvmgccdir=$PREFIX" config_options="--prefix=$PREFIX --with-llvmgccdir=$PREFIX"
if test "$OPTIMIZED" -eq 1 ; then if test "$OPTIMIZED" -eq 1 ; then
@ -45,12 +52,15 @@ if test ! -x "config.status" ; then
config_options="$config_options --disable-threads" config_options="$config_options --disable-threads"
fi fi
config_options="$config_options $OPTIONS_DASH $OPTIONS_DASH_DASH" config_options="$config_options $OPTIONS_DASH $OPTIONS_DASH_DASH"
src_dir=`pwd`
cd "$build_dir"
msg 0 Configuring $module with: msg 0 Configuring $module with:
msg 0 " ./configure" $config_options msg 0 " $src_dir/configure" $config_options
$LLVM_TOP/llvm/configure $config_options || \ $src_dir/configure $config_options || \
die $? "Configuring llvm module failed" die $? "Configuring $module module failed"
else else
msg 0 Module $module already configured, ignoring configure options. msg 0 Module $module already configured, ignoring configure options.
cd "$build_dir"
fi fi
msg 0 Building $module with: msg 0 Building $module with: