diff --git a/Makefile.config.in b/Makefile.config.in index fcb1746e75c..c0af6382fa6 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -233,3 +233,10 @@ ifndef LLVM_SRC_ROOT LLVM_SRC_ROOT := $(BUILD_SRC_ROOT) endif +# +# Set SourceDir for backwards compatbility. +# +ifndef SourceDir +SourceDir=$(BUILD_SRC_DIR) +endif + diff --git a/Makefile.rules b/Makefile.rules index 7aed7dc67da..796d54bcdb4 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -49,10 +49,8 @@ # # Set the VPATH so that we can find source files. -# Also set $SouceDir for backwards compatibility # -VPATH=$(BUILD_SRC_DIR) -SourceDir=$(BUILD_SRC_DIR) +VPATH=$(SourceDir) ########################################################################### # Default Targets: diff --git a/configure b/configure index a811c1f8616..e14caeef6aa 100755 --- a/configure +++ b/configure @@ -1625,6 +1625,12 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. ac_config_commands="$ac_config_commands runtime/GCCLibraries/libc/Makefile" + ac_config_commands="$ac_config_commands runtime/GCCLibraries/libcurses/Makefile" + + + ac_config_commands="$ac_config_commands runtime/GCCLibraries/libexception/Makefile" + + ac_config_commands="$ac_config_commands runtime/GCCLibraries/libg/Makefile" @@ -1637,9 +1643,18 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. ac_config_commands="$ac_config_commands runtime/GCCLibraries/libmalloc/Makefile" + ac_config_commands="$ac_config_commands runtime/GCCLibraries/libtermcap/Makefile" + + ac_config_commands="$ac_config_commands runtime/GCCLibraries/libucb/Makefile" + ac_config_commands="$ac_config_commands runtime/GCCLibraries/libutempter/Makefile" + + + ac_config_commands="$ac_config_commands runtime/GCCLibraries/libutil/Makefile" + + ac_config_commands="$ac_config_commands runtime/libdummy/Makefile" @@ -1706,6 +1721,9 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. ac_config_commands="$ac_config_commands test/Programs/External/SPEC/Makefile" + ac_config_commands="$ac_config_commands test/Programs/External/SPEC/Makefile.spec" + + ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CFP2000/Makefile" @@ -4356,7 +4374,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4359 "configure"' > conftest.$ac_ext + echo '#line 4377 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5197,7 +5215,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5200:" \ +echo "$as_me:5218:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6206,11 +6224,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6209: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6227: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6213: \$? = $ac_status" >&5 + echo "$as_me:6231: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6438,11 +6456,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6441: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6459: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6445: \$? = $ac_status" >&5 + echo "$as_me:6463: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6505,11 +6523,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6508: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6526: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6512: \$? = $ac_status" >&5 + echo "$as_me:6530: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8517,7 +8535,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:10772: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10758: \$? = $ac_status" >&5 + echo "$as_me:10776: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -10818,11 +10836,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10821: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10839: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10825: \$? = $ac_status" >&5 + echo "$as_me:10843: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12061,7 +12079,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13002: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12988: \$? = $ac_status" >&5 + echo "$as_me:13006: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13048,11 +13066,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13051: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13069: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13055: \$? = $ac_status" >&5 + echo "$as_me:13073: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14992,11 +15010,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14995: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15013: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14999: \$? = $ac_status" >&5 + echo "$as_me:15017: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15224,11 +15242,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15227: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15245: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15231: \$? = $ac_status" >&5 + echo "$as_me:15249: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15291,11 +15309,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15294: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15312: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15298: \$? = $ac_status" >&5 + echo "$as_me:15316: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17303,7 +17321,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&6;} runtime/GCCLibraries/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/GCCLibraries/Makefile runtime/GCCLibraries/Makefile ;; runtime/GCCLibraries/crtend/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/GCCLibraries/crtend/Makefile runtime/GCCLibraries/crtend/Makefile ;; runtime/GCCLibraries/libc/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/GCCLibraries/libc/Makefile runtime/GCCLibraries/libc/Makefile ;; + runtime/GCCLibraries/libcurses/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/GCCLibraries/libcurses/Makefile runtime/GCCLibraries/libcurses/Makefile ;; + runtime/GCCLibraries/libexception/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/GCCLibraries/libexception/Makefile runtime/GCCLibraries/libexception/Makefile ;; runtime/GCCLibraries/libg/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/GCCLibraries/libg/Makefile runtime/GCCLibraries/libg/Makefile ;; runtime/GCCLibraries/libgcc/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/GCCLibraries/libgcc/Makefile runtime/GCCLibraries/libgcc/Makefile ;; runtime/GCCLibraries/libm/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/GCCLibraries/libm/Makefile runtime/GCCLibraries/libm/Makefile ;; runtime/GCCLibraries/libmalloc/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/GCCLibraries/libmalloc/Makefile runtime/GCCLibraries/libmalloc/Makefile ;; + runtime/GCCLibraries/libtermcap/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/GCCLibraries/libtermcap/Makefile runtime/GCCLibraries/libtermcap/Makefile ;; runtime/GCCLibraries/libucb/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/GCCLibraries/libucb/Makefile runtime/GCCLibraries/libucb/Makefile ;; + runtime/GCCLibraries/libutempter/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/GCCLibraries/libutempter/Makefile runtime/GCCLibraries/libutempter/Makefile ;; + runtime/GCCLibraries/libutil/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/GCCLibraries/libutil/Makefile runtime/GCCLibraries/libutil/Makefile ;; runtime/libdummy/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/libdummy/Makefile runtime/libdummy/Makefile ;; runtime/libtrace/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/runtime/libtrace/Makefile runtime/libtrace/Makefile ;; test/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Makefile test/Makefile ;; @@ -24295,6 +24330,7 @@ echo "$as_me: executing $ac_dest commands" >&6;} test/Programs/TEST.micro.Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/TEST.micro.Makefile test/Programs/TEST.micro.Makefile ;; test/Programs/External/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/External/Makefile test/Programs/External/Makefile ;; test/Programs/External/SPEC/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/External/SPEC/Makefile test/Programs/External/SPEC/Makefile ;; + test/Programs/External/SPEC/Makefile.spec ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/External/SPEC/Makefile.spec test/Programs/External/SPEC/Makefile.spec ;; test/Programs/External/SPEC/CFP2000/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/External/SPEC/CFP2000/Makefile test/Programs/External/SPEC/CFP2000/Makefile ;; test/Programs/External/SPEC/CFP2000/179.art/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/External/SPEC/CFP2000/179.art/Makefile test/Programs/External/SPEC/CFP2000/179.art/Makefile ;; test/Programs/External/SPEC/CFP2000/183.equake/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/External/SPEC/CFP2000/183.equake/Makefile test/Programs/External/SPEC/CFP2000/183.equake/Makefile ;;