[llvm-commits] [llvm] r162707 - in /llvm/trunk: Makefile.config.in Makefile.rules autoconf/configure.ac configure
Sebastian Pop
spop at codeaurora.org
Mon Aug 27 18:36:50 PDT 2012
On Mon, Aug 27, 2012 at 8:30 PM, Eric Christopher <echristo at apple.com> wrote:
> I've reverted this for now, it was breaking builds on the bots.
Ok, do you have the url of these fails?
Thanks,
Sebastian
>
> -eric
>
> On Aug 27, 2012, at 4:05 PM, Sebastian Pop <spop at codeaurora.org> wrote:
>
>> Author: spop
>> Date: Mon Aug 27 18:05:06 2012
>> New Revision: 162707
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=162707&view=rev
>> Log:
>> Add --program-prefix support to build.
>>
>> Modified:
>> llvm/trunk/Makefile.config.in
>> llvm/trunk/Makefile.rules
>> llvm/trunk/autoconf/configure.ac
>> llvm/trunk/configure
>>
>> Modified: llvm/trunk/Makefile.config.in
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.config.in?rev=162707&r1=162706&r2=162707&view=diff
>> ==============================================================================
>> --- llvm/trunk/Makefile.config.in (original)
>> +++ llvm/trunk/Makefile.config.in Mon Aug 27 18:05:06 2012
>> @@ -61,6 +61,7 @@
>>
>> prefix := @prefix@
>> PROJ_prefix := $(prefix)
>> +program_prefix := @program_prefix@
>> PROJ_VERSION := $(LLVMVersion)
>> else
>> ifndef PROJ_SRC_ROOT
>>
>> Modified: llvm/trunk/Makefile.rules
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=162707&r1=162706&r2=162707&view=diff
>> ==============================================================================
>> --- llvm/trunk/Makefile.rules (original)
>> +++ llvm/trunk/Makefile.rules Mon Aug 27 18:05:06 2012
>> @@ -548,22 +548,22 @@
>> 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 @@
>> else
>> ToolBinDir = $(DESTDIR)$(PROJ_bindir)
>> endif
>> -DestTool = $(ToolBinDir)/$(TOOLEXENAME)
>> +DestTool = $(ToolBinDir)/$(program_prefix)$(TOOLEXENAME)
>>
>> install-local:: $(DestTool)
>>
>> @@ -1556,7 +1556,7 @@
>>
>> # TOOLALIAS install.
>> ifdef TOOLALIAS
>> -DestToolAlias = $(ToolBinDir)/$(TOOLALIAS)$(EXEEXT)
>> +DestToolAlias = $(ToolBinDir)/$(program_prefix)$(TOOLALIAS)$(EXEEXT)
>>
>> install-local:: $(DestToolAlias)
>>
>>
>> Modified: llvm/trunk/autoconf/configure.ac
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=162707&r1=162706&r2=162707&view=diff
>> ==============================================================================
>> --- llvm/trunk/autoconf/configure.ac (original)
>> +++ llvm/trunk/autoconf/configure.ac Mon Aug 27 18:05:06 2012
>> @@ -40,6 +40,9 @@
>> 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)
>>
>>
>> Modified: llvm/trunk/configure
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/configure?rev=162707&r1=162706&r2=162707&view=diff
>> ==============================================================================
>> --- llvm/trunk/configure (original)
>> +++ llvm/trunk/configure Mon Aug 27 18:05:06 2012
>> @@ -640,6 +640,7 @@
>> host_alias
>> target_alias
>> LLVM_COPYRIGHT
>> +program_prefix
>> CC
>> CFLAGS
>> LDFLAGS
>> @@ -1928,6 +1929,8 @@
>>
>>
>>
>> +
>> +
>> ac_aux_dir=
>> for ac_dir in autoconf "$srcdir"/autoconf; do
>> if test -f "$ac_dir/install-sh"; then
>> @@ -10289,7 +10292,7 @@
>> 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 @@
>> 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 @@
>> 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 @@
>> 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 @@
>> 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 @@
>>
>> 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 @@
>> ' >>$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_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"; } &&
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
--
Qualcomm Innovation Center, Inc is a member of Code Aurora Forum
More information about the llvm-commits
mailing list