[llvm-commits] [test-suite] r164650 - in /test-suite/trunk: Makefile.config.in Makefile.rules autoconf/configure.ac configure
Jordan Rose
jordan_rose at apple.com
Tue Sep 25 17:00:53 PDT 2012
Author: jrose
Date: Tue Sep 25 19:00:53 2012
New Revision: 164650
URL: http://llvm.org/viewvc/llvm-project?rev=164650&view=rev
Log:
Revert "Add --program-prefix support to build"
The Apple buildbots are set up to pass --target to configure for both
cross- and non-cross-compile builds, and the standard autoconf response
to this is to set the program prefix to '<target>-'. Until we can figure
out the proper way to handle this (don't pass --target? pass an explicit
--program-prefix=""? don't auto-populate program_prefix with target_alias?)
it's more important to keep the buildbots running.
This reverts r164632.
Modified:
test-suite/trunk/Makefile.config.in
test-suite/trunk/Makefile.rules
test-suite/trunk/autoconf/configure.ac
test-suite/trunk/configure
Modified: test-suite/trunk/Makefile.config.in
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.config.in?rev=164650&r1=164649&r2=164650&view=diff
==============================================================================
--- test-suite/trunk/Makefile.config.in (original)
+++ test-suite/trunk/Makefile.config.in Tue Sep 25 19:00:53 2012
@@ -31,7 +31,6 @@
# Set the root directory of this project's install prefix
PROJ_INSTALL_ROOT := @prefix@
-program_prefix := @program_prefix@
# Include LLVM's configuration Makefile, if available.
ifeq ($(HAS_LLVM),1)
Modified: test-suite/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.rules?rev=164650&r1=164649&r2=164650&view=diff
==============================================================================
--- test-suite/trunk/Makefile.rules (original)
+++ test-suite/trunk/Makefile.rules Tue Sep 25 19:00:53 2012
@@ -869,7 +869,7 @@
install:: $(TOOLEXENAMES)
@${ECHO} Installing $(TOOLEXENAMES) to $(DESTDIR)$(bindir)
$(VERB)$(MKDIR) $(DESTDIR)$(bindir)
- $(VERB)$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -c -m 0755 $(TOOLEXENAMES) $(DESTDIR)$(bindir)/$(program_prefix)$(TOOLNAME)
+ $(VERB)$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -c -m 0755 $(TOOLEXENAMES) $(DESTDIR)$(bindir)/$(TOOLNAME)
endif
Modified: test-suite/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/autoconf/configure.ac?rev=164650&r1=164649&r2=164650&view=diff
==============================================================================
--- test-suite/trunk/autoconf/configure.ac (original)
+++ test-suite/trunk/autoconf/configure.ac Tue Sep 25 19:00:53 2012
@@ -121,7 +121,6 @@
mipsel-*) llvm_cv_target_arch="Mips" ;;
xcore-*) llvm_cv_target_arch="XCore" ;;
msp430-*) llvm_cv_target_arch="MSP430" ;;
- hexagon-*) llvm_cv_target_arch="Hexagon" ;;
s390x-*) llvm_cv_target_arch="SystemZ" ;;
bfin-*) llvm_cv_target_arch="Blackfin" ;;
mblaze-*) llvm_cv_target_arch="MBlaze" ;;
@@ -399,9 +398,5 @@
AC_LTDL_SHLIBEXT
AC_SUBST(SHLIBEXT,$libltdl_cv_shlibext)
-dnl Add --program-prefix value to Makefile.rules. Already an ARG variable.
-test "x$program_prefix" = "xNONE" && program_prefix=""
-AC_SUBST([program_prefix])
-
dnl Create the output files
AC_OUTPUT
Modified: test-suite/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/configure?rev=164650&r1=164649&r2=164650&view=diff
==============================================================================
--- test-suite/trunk/configure (original)
+++ test-suite/trunk/configure Tue Sep 25 19:00:53 2012
@@ -883,7 +883,6 @@
F95_LIB
HAVE_RE_COMP
SHLIBEXT
-program_prefix
LIBOBJS
LTLIBOBJS'
ac_subst_files=''
@@ -2308,7 +2307,6 @@
mipsel-*) llvm_cv_target_arch="Mips" ;;
xcore-*) llvm_cv_target_arch="XCore" ;;
msp430-*) llvm_cv_target_arch="MSP430" ;;
- hexagon-*) llvm_cv_target_arch="Hexagon" ;;
s390x-*) llvm_cv_target_arch="SystemZ" ;;
bfin-*) llvm_cv_target_arch="Blackfin" ;;
mblaze-*) llvm_cv_target_arch="MBlaze" ;;
@@ -6902,7 +6900,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6905 "configure"' > conftest.$ac_ext
+ echo '#line 6903 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7868,7 +7866,7 @@
lt_cv_sys_max_cmd_len=8192;
;;
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | bitrig*)
+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
# This has been around since 386BSD, at least. Likely further.
if test -x /sbin/sysctl; then
lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -8540,7 +8538,7 @@
if test -n "$RANLIB"; then
case $host_os in
- openbsd* | bitrig*)
+ openbsd*)
old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
;;
*)
@@ -8789,11 +8787,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8792: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8790: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8796: \$? = $ac_status" >&5
+ echo "$as_me:8794: \$? = $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 other than the usual output.
@@ -9057,11 +9055,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9060: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9058: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9064: \$? = $ac_status" >&5
+ echo "$as_me:9062: \$? = $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 other than the usual output.
@@ -9161,11 +9159,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9164: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9162: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9168: \$? = $ac_status" >&5
+ echo "$as_me:9166: \$? = $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
@@ -10002,7 +10000,7 @@
hardcode_shlibpath_var=no
;;
- openbsd* | bitrig*)
+ openbsd*)
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -10716,7 +10714,7 @@
shlibpath_overrides_runpath=yes
;;
-openbsd* | bitrig*)
+openbsd*)
version_type=sunos
sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
@@ -11613,7 +11611,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11616 "configure"
+#line 11614 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11713,7 +11711,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11716 "configure"
+#line 11714 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13334,7 +13332,7 @@
# C++ shared libraries are fairly broken
ld_shlibs_CXX=no
;;
- openbsd* | bitrig*)
+ openbsd*)
hardcode_direct_CXX=yes
hardcode_shlibpath_var_CXX=no
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
@@ -14081,11 +14079,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14084: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14082: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14088: \$? = $ac_status" >&5
+ echo "$as_me:14086: \$? = $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 other than the usual output.
@@ -14185,11 +14183,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14188: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14186: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14192: \$? = $ac_status" >&5
+ echo "$as_me:14190: \$? = $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
@@ -14779,7 +14777,7 @@
shlibpath_overrides_runpath=yes
;;
-openbsd* | bitrig*)
+openbsd*)
version_type=sunos
sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
@@ -15755,11 +15753,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15758: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15756: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15762: \$? = $ac_status" >&5
+ echo "$as_me:15760: \$? = $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 other than the usual output.
@@ -15859,11 +15857,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15862: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15860: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15866: \$? = $ac_status" >&5
+ echo "$as_me:15864: \$? = $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
@@ -16680,7 +16678,7 @@
hardcode_shlibpath_var_F77=no
;;
- openbsd* | bitrig*)
+ openbsd*)
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -17394,7 +17392,7 @@
shlibpath_overrides_runpath=yes
;;
-openbsd* | bitrig*)
+openbsd*)
version_type=sunos
sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
@@ -18094,11 +18092,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18097: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18095: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18101: \$? = $ac_status" >&5
+ echo "$as_me:18099: \$? = $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 other than the usual output.
@@ -18362,11 +18360,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18365: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18363: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18369: \$? = $ac_status" >&5
+ echo "$as_me:18367: \$? = $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 other than the usual output.
@@ -18466,11 +18464,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18469: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18467: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18473: \$? = $ac_status" >&5
+ echo "$as_me:18471: \$? = $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
@@ -19307,7 +19305,7 @@
hardcode_shlibpath_var_GCJ=no
;;
- openbsd* | bitrig*)
+ openbsd*)
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -20021,7 +20019,7 @@
shlibpath_overrides_runpath=yes
;;
-openbsd* | bitrig*)
+openbsd*)
version_type=sunos
sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
@@ -22035,9 +22033,6 @@
SHLIBEXT=$libltdl_cv_shlibext
-test "x$program_prefix" = "xNONE" && program_prefix=""
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -22871,12 +22866,11 @@
F95_LIB!$F95_LIB$ac_delim
HAVE_RE_COMP!$HAVE_RE_COMP$ac_delim
SHLIBEXT!$SHLIBEXT$ac_delim
-program_prefix!$program_prefix$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 34; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
More information about the llvm-commits
mailing list