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

Add --program-prefix support to build

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@164633 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Sebastian Pop 2012-09-25 21:15:08 +00:00
parent 2039a8f834
commit ba48ceb1a3
6 changed files with 21 additions and 11 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

@ -1732,6 +1732,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)

16
configure vendored
View File

@ -792,6 +792,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=''
@ -10316,7 +10317,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 10319 "configure" #line 10320 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -21409,6 +21410,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"
@ -22334,11 +22339,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` = 95; then if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; 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
@ -22357,7 +22363,7 @@ fi
cat >>$CONFIG_STATUS <<_ACEOF cat >>$CONFIG_STATUS <<_ACEOF
cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
_ACEOF _ACEOF
sed ' sed '
s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
@ -22370,8 +22376,6 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
' >>$CONFIG_STATUS <conf$$subs.sed ' >>$CONFIG_STATUS <conf$$subs.sed
rm -f conf$$subs.sed rm -f conf$$subs.sed
cat >>$CONFIG_STATUS <<_ACEOF cat >>$CONFIG_STATUS <<_ACEOF
:end
s/|#_!!_#|//g
CEOF$ac_eof CEOF$ac_eof
_ACEOF _ACEOF
@ -22619,7 +22623,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack $ac_datarootdir_hack
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed 's/|#_!!_#|//g' >$tmp/out
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&

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