6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 20:32:21 +00:00
Code Issues Projects Releases Wiki Activity

Re-enable support for --program-prefix.

Browse Source 
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
This commit is contained in:
Jordan Rose 2012-10-01 18:40:32 +00:00
parent 7744345a71
commit 92080529a0
6 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.config.in
View File

@ -61,6 +61,7 @@ endif
prefix := @prefix@ prefix := @prefix@
PROJ_prefix := $(prefix) PROJ_prefix := $(prefix)
program_prefix := @program_prefix@
PROJ_VERSION := $(LLVMVersion) PROJ_VERSION := $(LLVMVersion)
else else
ifndef PROJ_SRC_ROOT ifndef PROJ_SRC_ROOT

4
Makefile.rules
View File

@ -1541,7 +1541,7 @@ ToolBinDir = $(DESTDIR)$(PROJ_internal_prefix)/bin
else else
ToolBinDir = $(DESTDIR)$(PROJ_bindir) ToolBinDir = $(DESTDIR)$(PROJ_bindir)
endif endif
DestTool = $(ToolBinDir)/$(TOOLEXENAME) DestTool = $(ToolBinDir)/$(program_prefix)$(TOOLEXENAME)
install-local:: $(DestTool) install-local:: $(DestTool)
@ -1556,7 +1556,7 @@ uninstall-local::
# TOOLALIAS install. # TOOLALIAS install.
ifdef TOOLALIAS ifdef TOOLALIAS
DestToolAlias = $(ToolBinDir)/$(TOOLALIAS)$(EXEEXT) DestToolAlias = $(ToolBinDir)/$(program_prefix)$(TOOLALIAS)$(EXEEXT)
install-local:: $(DestToolAlias) install-local:: $(DestToolAlias)

5
autoconf/configure.ac
View File

@ -1709,6 +1709,11 @@ fi
dnl OCaml findlib META file dnl OCaml findlib META file
AC_CONFIG_FILES([bindings/ocaml/llvm/META.llvm]) AC_CONFIG_FILES([bindings/ocaml/llvm/META.llvm])
dnl Add --program-prefix value to Makefile.rules. Already an ARG variable.
test "x$program_prefix" = "xNONE" && program_prefix=""
AC_SUBST([program_prefix])
dnl Do special configuration of Makefiles dnl Do special configuration of Makefiles
AC_CONFIG_COMMANDS([setup],,[llvm_src="${srcdir}"]) AC_CONFIG_COMMANDS([setup],,[llvm_src="${srcdir}"])
AC_CONFIG_MAKEFILE(Makefile) AC_CONFIG_MAKEFILE(Makefile)

10
configure vendored
View File

@ -790,6 +790,7 @@ OCAML_LIBDIR
ENABLE_VISIBILITY_INLINES_HIDDEN ENABLE_VISIBILITY_INLINES_HIDDEN
RPATH RPATH
RDYNAMIC RDYNAMIC
program_prefix
LIBOBJS LIBOBJS
LTLIBOBJS' LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
@ -10312,7 +10313,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 10315 "configure" #line 10316 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -21127,6 +21128,10 @@ fi
ac_config_files="$ac_config_files bindings/ocaml/llvm/META.llvm" 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 setup"
ac_config_commands="$ac_config_commands Makefile" 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 ENABLE_VISIBILITY_INLINES_HIDDEN!$ENABLE_VISIBILITY_INLINES_HIDDEN$ac_delim
RPATH!$RPATH$ac_delim RPATH!$RPATH$ac_delim
RDYNAMIC!$RDYNAMIC$ac_delim RDYNAMIC!$RDYNAMIC$ac_delim
program_prefix!$program_prefix$ac_delim
LIBOBJS!$LIBOBJS$ac_delim LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF _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 break
elif $ac_last_try; then elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

4
projects/sample/Makefile.llvm.rules
View File

@ -1437,7 +1437,7 @@ install-local::
uninstall-local:: uninstall-local::
$(Echo) Uninstall circumvented with NO_INSTALL $(Echo) Uninstall circumvented with NO_INSTALL
else else
DestTool = $(DESTDIR)$(PROJ_bindir)/$(TOOLEXENAME) DestTool = $(DESTDIR)$(PROJ_bindir)/$(program_prefix)$(TOOLEXENAME)
install-local:: $(DestTool) install-local:: $(DestTool)
@ -1451,7 +1451,7 @@ uninstall-local::
# TOOLALIAS install. # TOOLALIAS install.
ifdef TOOLALIAS ifdef TOOLALIAS
DestToolAlias = $(DESTDIR)$(PROJ_bindir)/$(TOOLALIAS)$(EXEEXT) DestToolAlias = $(DESTDIR)$(PROJ_bindir)/$(program_prefix)$(TOOLALIAS)$(EXEEXT)
install-local:: $(DestToolAlias) install-local:: $(DestToolAlias)

2
tools/llvm-config/Makefile
View File

@ -63,5 +63,5 @@ ifeq ($(LLVM_CROSS_COMPILING),1)
install:: $(DESTDIR)$(PROJ_bindir) install:: $(DESTDIR)$(PROJ_bindir)
$(Echo) Installing llvm-config-host $(Echo) Installing llvm-config-host
$(Verb) $(ProgInstall) $(BuildLLVMToolDir)/llvm-config \ $(Verb) $(ProgInstall) $(BuildLLVMToolDir)/llvm-config \
$(DESTDIR)$(PROJ_bindir)/llvm-config-host $(DESTDIR)$(PROJ_bindir)/$(program_prefix)llvm-config-host
endif endif