llvm.org GIT mirror llvm / 9208052
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! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@164956 91177308-0d34-0410-b5e6-96231b3b80d8 Jordan Rose 8 years ago
6 changed file(s) with 19 addition(s) and 7 deletion(s). Raw diff Collapse all Expand all
6060
6161 prefix := @prefix@
6262 PROJ_prefix := $(prefix)
63 program_prefix := @program_prefix@
6364 PROJ_VERSION := $(LLVMVersion)
6465 else
6566 ifndef PROJ_SRC_ROOT
15401540 else
15411541 ToolBinDir = $(DESTDIR)$(PROJ_bindir)
15421542 endif
1543 DestTool = $(ToolBinDir)/$(TOOLEXENAME)
1543 DestTool = $(ToolBinDir)/$(program_prefix)$(TOOLEXENAME)
15441544
15451545 install-local:: $(DestTool)
15461546
15551555
15561556 # TOOLALIAS install.
15571557 ifdef TOOLALIAS
1558 DestToolAlias = $(ToolBinDir)/$(TOOLALIAS)$(EXEEXT)
1558 DestToolAlias = $(ToolBinDir)/$(program_prefix)$(TOOLALIAS)$(EXEEXT)
15591559
15601560 install-local:: $(DestToolAlias)
15611561
17081708 dnl OCaml findlib META file
17091709 AC_CONFIG_FILES([bindings/ocaml/llvm/META.llvm])
17101710
1711 dnl Add --program-prefix value to Makefile.rules. Already an ARG variable.
1712 test "x$program_prefix" = "xNONE" && program_prefix=""
1713 AC_SUBST([program_prefix])
1714
1715
17111716 dnl Do special configuration of Makefiles
17121717 AC_CONFIG_COMMANDS([setup],,[llvm_src="${srcdir}"])
17131718 AC_CONFIG_MAKEFILE(Makefile)
789789 ENABLE_VISIBILITY_INLINES_HIDDEN
790790 RPATH
791791 RDYNAMIC
792 program_prefix
792793 LIBOBJS
793794 LTLIBOBJS'
794795 ac_subst_files=''
1031110312 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1031210313 lt_status=$lt_dlunknown
1031310314 cat > conftest.$ac_ext <
10314 #line 10315 "configure"
10315 #line 10316 "configure"
1031510316 #include "confdefs.h"
1031610317
1031710318 #if HAVE_DLFCN_H
2112421125 fi
2112521126
2112621127 ac_config_files="$ac_config_files bindings/ocaml/llvm/META.llvm"
21128
21129
21130 test "x$program_prefix" = "xNONE" && program_prefix=""
21131
2112721132
2112821133
2112921134 ac_config_commands="$ac_config_commands setup"
2204922054 ENABLE_VISIBILITY_INLINES_HIDDEN!$ENABLE_VISIBILITY_INLINES_HIDDEN$ac_delim
2205022055 RPATH!$RPATH$ac_delim
2205122056 RDYNAMIC!$RDYNAMIC$ac_delim
22057 program_prefix!$program_prefix$ac_delim
2205222058 LIBOBJS!$LIBOBJS$ac_delim
2205322059 LTLIBOBJS!$LTLIBOBJS$ac_delim
2205422060 _ACEOF
2205522061
22056 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 93; then
22062 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then
2205722063 break
2205822064 elif $ac_last_try; then
2205922065 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
14361436 uninstall-local::
14371437 $(Echo) Uninstall circumvented with NO_INSTALL
14381438 else
1439 DestTool = $(DESTDIR)$(PROJ_bindir)/$(TOOLEXENAME)
1439 DestTool = $(DESTDIR)$(PROJ_bindir)/$(program_prefix)$(TOOLEXENAME)
14401440
14411441 install-local:: $(DestTool)
14421442
14501450
14511451 # TOOLALIAS install.
14521452 ifdef TOOLALIAS
1453 DestToolAlias = $(DESTDIR)$(PROJ_bindir)/$(TOOLALIAS)$(EXEEXT)
1453 DestToolAlias = $(DESTDIR)$(PROJ_bindir)/$(program_prefix)$(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)/llvm-config-host
65 $(DESTDIR)$(PROJ_bindir)/$(program_prefix)llvm-config-host
6666 endif