llvm.org GIT mirror llvm / 85042e6
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 r164633 / ba48ceb1a3802e20e781ef04ea2573ffae2ac414. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@164651 91177308-0d34-0410-b5e6-96231b3b80d8 Jordan Rose 7 years ago
6 changed file(s) with 11 addition(s) and 21 deletion(s). Raw diff Collapse all Expand all
6060
6161 prefix := @prefix@
6262 PROJ_prefix := $(prefix)
63 program_prefix := @program_prefix@
6463 PROJ_VERSION := $(LLVMVersion)
6564 else
6665 ifndef PROJ_SRC_ROOT
15401540 else
15411541 ToolBinDir = $(DESTDIR)$(PROJ_bindir)
15421542 endif
1543 DestTool = $(ToolBinDir)/$(program_prefix)$(TOOLEXENAME)
1543 DestTool = $(ToolBinDir)/$(TOOLEXENAME)
15441544
15451545 install-local:: $(DestTool)
15461546
15551555
15561556 # TOOLALIAS install.
15571557 ifdef TOOLALIAS
1558 DestToolAlias = $(ToolBinDir)/$(program_prefix)$(TOOLALIAS)$(EXEEXT)
1558 DestToolAlias = $(ToolBinDir)/$(TOOLALIAS)$(EXEEXT)
15591559
15601560 install-local:: $(DestToolAlias)
15611561
17311731 dnl OCaml findlib META file
17321732 AC_CONFIG_FILES([bindings/ocaml/llvm/META.llvm])
17331733
1734 dnl Add --program-prefix value to Makefile.rules. Already an ARG variable.
1735 test "x$program_prefix" = "xNONE" && program_prefix=""
1736 AC_SUBST([program_prefix])
1737
1738
17391734 dnl Do special configuration of Makefiles
17401735 AC_CONFIG_COMMANDS([setup],,[llvm_src="${srcdir}"])
17411736 AC_CONFIG_MAKEFILE(Makefile)
791791 ENABLE_VISIBILITY_INLINES_HIDDEN
792792 RPATH
793793 RDYNAMIC
794 program_prefix
795794 LIBOBJS
796795 LTLIBOBJS'
797796 ac_subst_files=''
1031610315 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1031710316 lt_status=$lt_dlunknown
1031810317 cat > conftest.$ac_ext <
10319 #line 10320 "configure"
10318 #line 10319 "configure"
1032010319 #include "confdefs.h"
1032110320
1032210321 #if HAVE_DLFCN_H
2140721406 fi
2140821407
2140921408 ac_config_files="$ac_config_files bindings/ocaml/llvm/META.llvm"
21410
21411
21412 test "x$program_prefix" = "xNONE" && program_prefix=""
21413
2141421409
2141521410
2141621411 ac_config_commands="$ac_config_commands setup"
2233822333 ENABLE_VISIBILITY_INLINES_HIDDEN!$ENABLE_VISIBILITY_INLINES_HIDDEN$ac_delim
2233922334 RPATH!$RPATH$ac_delim
2234022335 RDYNAMIC!$RDYNAMIC$ac_delim
22341 program_prefix!$program_prefix$ac_delim
2234222336 LIBOBJS!$LIBOBJS$ac_delim
2234322337 LTLIBOBJS!$LTLIBOBJS$ac_delim
2234422338 _ACEOF
2234522339
22346 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then
22340 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then
2234722341 break
2234822342 elif $ac_last_try; then
2234922343 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
2236222356
2236322357 cat >>$CONFIG_STATUS <<_ACEOF
2236422358 cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
22365 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
22359 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
2236622360 _ACEOF
2236722361 sed '
2236822362 s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
2237522369 ' >>$CONFIG_STATUS
2237622370 rm -f conf$$subs.sed
2237722371 cat >>$CONFIG_STATUS <<_ACEOF
22372 :end
22373 s/|#_!!_#|//g
2237822374 CEOF$ac_eof
2237922375 _ACEOF
2238022376
2262222618 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
2262322619 s&@INSTALL@&$ac_INSTALL&;t t
2262422620 $ac_datarootdir_hack
22625 " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed 's/|#_!!_#|//g' >$tmp/out
22621 " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
2262622622
2262722623 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
2262822624 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
14361436 uninstall-local::
14371437 $(Echo) Uninstall circumvented with NO_INSTALL
14381438 else
1439 DestTool = $(DESTDIR)$(PROJ_bindir)/$(program_prefix)$(TOOLEXENAME)
1439 DestTool = $(DESTDIR)$(PROJ_bindir)/$(TOOLEXENAME)
14401440
14411441 install-local:: $(DestTool)
14421442
14501450
14511451 # TOOLALIAS install.
14521452 ifdef TOOLALIAS
1453 DestToolAlias = $(DESTDIR)$(PROJ_bindir)/$(program_prefix)$(TOOLALIAS)$(EXEEXT)
1453 DestToolAlias = $(DESTDIR)$(PROJ_bindir)/$(TOOLALIAS)$(EXEEXT)
14541454
14551455 install-local:: $(DestToolAlias)
14561456
6262 install:: $(DESTDIR)$(PROJ_bindir)
6363 $(Echo) Installing llvm-config-host
6464 $(Verb) $(ProgInstall) $(BuildLLVMToolDir)/llvm-config \
65 $(DESTDIR)$(PROJ_bindir)/$(program_prefix)llvm-config-host
65 $(DESTDIR)$(PROJ_bindir)/llvm-config-host
6666 endif