mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-06-26 10:29:57 +00:00
Add --program-prefix support to build.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@162707 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Sebastian Pop
parent
e1630e01de
commit
94a935f072
|
|
@ -61,6 +61,7 @@ endif
|
|||
|
||||
prefix := @prefix@
|
||||
PROJ_prefix := $(prefix)
|
||||
program_prefix := @program_prefix@
|
||||
PROJ_VERSION := $(LLVMVersion)
|
||||
else
|
||||
ifndef PROJ_SRC_ROOT
|
||||
|
|
|
|||
|
|
@ -548,22 +548,22 @@ else
|
|||
LLVM_CONFIG := $(LLVMToolDir)/llvm-config$(EXEEXT)
|
||||
endif
|
||||
ifndef LLVMDIS
|
||||
LLVMDIS := $(LLVMToolDir)/llvm-dis$(EXEEXT)
|
||||
LLVMDIS := $(LLVMToolDir)/$(program_prefix)llvm-dis$(EXEEXT)
|
||||
endif
|
||||
ifndef LLI
|
||||
LLI := $(LLVMToolDir)/lli$(EXEEXT)
|
||||
LLI := $(LLVMToolDir)/$(program_prefix)lli$(EXEEXT)
|
||||
endif
|
||||
ifndef LLC
|
||||
LLC := $(LLVMToolDir)/llc$(EXEEXT)
|
||||
LLC := $(LLVMToolDir)/$(program_prefix)llc$(EXEEXT)
|
||||
endif
|
||||
ifndef LOPT
|
||||
LOPT := $(LLVMToolDir)/opt$(EXEEXT)
|
||||
LOPT := $(LLVMToolDir)/$(program_prefix)opt$(EXEEXT)
|
||||
endif
|
||||
ifndef LBUGPOINT
|
||||
LBUGPOINT := $(LLVMToolDir)/bugpoint$(EXEEXT)
|
||||
LBUGPOINT := $(LLVMToolDir)/$(program_prefix)bugpoint$(EXEEXT)
|
||||
endif
|
||||
ifndef LLVMLINK
|
||||
LLVMLINK := $(LLVMToolDir)/llvm-link$(EXEEXT)
|
||||
LLVMLINK := $(LLVMToolDir)/$(program_prefix)llvm-link$(EXEEXT)
|
||||
endif
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -1541,7 +1541,7 @@ ToolBinDir = $(DESTDIR)$(PROJ_internal_prefix)/bin
|
|||
else
|
||||
ToolBinDir = $(DESTDIR)$(PROJ_bindir)
|
||||
endif
|
||||
DestTool = $(ToolBinDir)/$(TOOLEXENAME)
|
||||
DestTool = $(ToolBinDir)/$(program_prefix)$(TOOLEXENAME)
|
||||
|
||||
install-local:: $(DestTool)
|
||||
|
||||
|
|
@ -1556,7 +1556,7 @@ uninstall-local::
|
|||
|
||||
# TOOLALIAS install.
|
||||
ifdef TOOLALIAS
|
||||
DestToolAlias = $(ToolBinDir)/$(TOOLALIAS)$(EXEEXT)
|
||||
DestToolAlias = $(ToolBinDir)/$(program_prefix)$(TOOLALIAS)$(EXEEXT)
|
||||
|
||||
install-local:: $(DestToolAlias)
|
||||
|
||||
|
|
|
|||
|
|
@ -40,6 +40,9 @@ dnl in the output of --version option of the generated configure script.
|
|||
AC_SUBST(LLVM_COPYRIGHT,["Copyright (c) 2003-2012 University of Illinois at Urbana-Champaign."])
|
||||
AC_COPYRIGHT([Copyright (c) 2003-2012 University of Illinois at Urbana-Champaign.])
|
||||
|
||||
dnl Add --program-prefix value to Makefile.rules. Already an ARG variable.
|
||||
AC_SUBST([program_prefix])
|
||||
|
||||
dnl Indicate that we require autoconf 2.60 or later.
|
||||
AC_PREREQ(2.60)
|
||||
|
||||
|
|
|
|||
16
configure
vendored
16
configure
vendored
|
|
@ -640,6 +640,7 @@ build_alias
|
|||
host_alias
|
||||
target_alias
|
||||
LLVM_COPYRIGHT
|
||||
program_prefix
|
||||
CC
|
||||
CFLAGS
|
||||
LDFLAGS
|
||||
|
|
@ -1928,6 +1929,8 @@ LLVM_COPYRIGHT="Copyright (c) 2003-2012 University of Illinois at Urbana-Champai
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
ac_aux_dir=
|
||||
for ac_dir in autoconf "$srcdir"/autoconf; do
|
||||
if test -f "$ac_dir/install-sh"; then
|
||||
|
|
@ -10289,7 +10292,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10292 "configure"
|
||||
#line 10295 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -22114,6 +22117,7 @@ build_alias!$build_alias$ac_delim
|
|||
host_alias!$host_alias$ac_delim
|
||||
target_alias!$target_alias$ac_delim
|
||||
LLVM_COPYRIGHT!$LLVM_COPYRIGHT$ac_delim
|
||||
program_prefix!$program_prefix$ac_delim
|
||||
CC!$CC$ac_delim
|
||||
CFLAGS!$CFLAGS$ac_delim
|
||||
LDFLAGS!$LDFLAGS$ac_delim
|
||||
|
|
@ -22172,7 +22176,6 @@ JIT!$JIT$ac_delim
|
|||
TARGET_HAS_JIT!$TARGET_HAS_JIT$ac_delim
|
||||
ENABLE_DOCS!$ENABLE_DOCS$ac_delim
|
||||
ENABLE_DOXYGEN!$ENABLE_DOXYGEN$ac_delim
|
||||
LLVM_ENABLE_THREADS!$LLVM_ENABLE_THREADS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
|
|
@ -22214,6 +22217,7 @@ _ACEOF
|
|||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
LLVM_ENABLE_THREADS!$LLVM_ENABLE_THREADS$ac_delim
|
||||
ENABLE_PTHREADS!$ENABLE_PTHREADS$ac_delim
|
||||
ENABLE_PIC!$ENABLE_PIC$ac_delim
|
||||
ENABLE_SHARED!$ENABLE_SHARED$ac_delim
|
||||
|
|
@ -22311,7 +22315,7 @@ LIBOBJS!$LIBOBJS$ac_delim
|
|||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||
_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
|
||||
elif $ac_last_try; then
|
||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||
|
|
@ -22330,7 +22334,7 @@ fi
|
|||
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
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
|
||||
sed '
|
||||
s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
|
||||
|
|
@ -22343,8 +22347,6 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
|
|||
' >>$CONFIG_STATUS <conf$$subs.sed
|
||||
rm -f conf$$subs.sed
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
:end
|
||||
s/|#_!!_#|//g
|
||||
CEOF$ac_eof
|
||||
_ACEOF
|
||||
|
||||
|
|
@ -22592,7 +22594,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
|
|||
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
|
||||
s&@INSTALL@&$ac_INSTALL&;t t
|
||||
$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" &&
|
||||
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user