diff options
| author | Jordan Rose <jordan_rose@apple.com> | 2012-10-01 18:40:32 +0000 |
|---|---|---|
| committer | Jordan Rose <jordan_rose@apple.com> | 2012-10-01 18:40:32 +0000 |
| commit | 3c837abd2bd0ed818f7a9b0fb18f7b5b35567ea9 (patch) | |
| tree | f67c5416e6107c6b457281d6c371d258e95538a5 /llvm/configure | |
| parent | 4a5b35eeec9412fca288ff8e7d51fcc6f473b319 (diff) | |
| download | bcm5719-llvm-3c837abd2bd0ed818f7a9b0fb18f7b5b35567ea9.tar.gz bcm5719-llvm-3c837abd2bd0ed818f7a9b0fb18f7b5b35567ea9.zip | |
Re-enable support for --program-prefix.
The Apple buildbots have been modified not to pass --target,
so they shouldn't choke on a default program prefix anymore.
Patch by Rick Foos!
llvm-svn: 164956
Diffstat (limited to 'llvm/configure')
| -rwxr-xr-x | llvm/configure | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/llvm/configure b/llvm/configure index 1905537f4e1..e9ab6bc009e 100755 --- a/llvm/configure +++ b/llvm/configure @@ -790,6 +790,7 @@ OCAML_LIBDIR ENABLE_VISIBILITY_INLINES_HIDDEN RPATH RDYNAMIC +program_prefix LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -10312,7 +10313,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10315 "configure" +#line 10316 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -21127,6 +21128,10 @@ fi ac_config_files="$ac_config_files bindings/ocaml/llvm/META.llvm" +test "x$program_prefix" = "xNONE" && program_prefix="" + + + ac_config_commands="$ac_config_commands setup" ac_config_commands="$ac_config_commands Makefile" @@ -22050,11 +22055,12 @@ OCAML_LIBDIR!$OCAML_LIBDIR$ac_delim ENABLE_VISIBILITY_INLINES_HIDDEN!$ENABLE_VISIBILITY_INLINES_HIDDEN$ac_delim RPATH!$RPATH$ac_delim RDYNAMIC!$RDYNAMIC$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` = 93; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |
