[llvm-commits] [llvm] r99336 - in /llvm/trunk: tools/Makefile utils/buildit/build_llvm

[Bill Wendling]

I didn't know about that variable. :-) I'll give it a shot tomorrow. Thx.

-bw

On Mar 24, 2010, at 12:36 PM, Daniel Dunbar wrote:

> Hi Bill,
> 
> Why not change to using ONLY_TOOLS to handle this, instead of adding
> yet another specialized Makefile variable?
> 
> - Daniel
> 
> On Tue, Mar 23, 2010 at 3:15 PM, Bill Wendling <isanbard at gmail.com> wrote:
>> Author: void
>> Date: Tue Mar 23 17:15:33 2010
>> New Revision: 99336
>> 
>> URL: http://llvm.org/viewvc/llvm-project?rev=99336&view=rev
>> Log:
>> Use "DISABLE_EDIS" to disable building "edis" explicitly. Don't build it for
>> Apple-style builds.
>> 
>> Modified:
>>    llvm/trunk/tools/Makefile
>>    llvm/trunk/utils/buildit/build_llvm
>> 
>> Modified: llvm/trunk/tools/Makefile
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/Makefile?rev=99336&r1=99335&r2=99336&view=diff
>> ==============================================================================
>> --- llvm/trunk/tools/Makefile (original)
>> +++ llvm/trunk/tools/Makefile Tue Mar 23 17:15:33 2010
>> @@ -22,7 +22,6 @@
>>                  lli llvm-extract \
>>                  bugpoint llvm-bcanalyzer llvm-stub \
>>                  llvm-mc llvmc
>> -
>> 
>>  # Let users override the set of tools to build from the command line.
>>  ifdef ONLY_TOOLS
>> @@ -38,7 +37,7 @@
>>   # No support for dynamic libraries on windows targets.
>>   ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
>>     PARALLEL_DIRS += edis
>> -
>> +
>>     # gold only builds if binutils is around.  It requires "lto" to build before
>>     # it so it is added to DIRS.
>>     ifdef BINUTILS_INCDIR
>> @@ -54,4 +53,9 @@
>>   PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))
>>  endif
>> 
>> +# Don't build edis if we explicitly disabled it.
>> +ifneq ($(DISABLE_EDIS),1)
>> +  PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))
>> +endif
>> +
>>  include $(LEVEL)/Makefile.common
>> 
>> Modified: llvm/trunk/utils/buildit/build_llvm
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/buildit/build_llvm?rev=99336&r1=99335&r2=99336&view=diff
>> ==============================================================================
>> --- llvm/trunk/utils/buildit/build_llvm (original)
>> +++ llvm/trunk/utils/buildit/build_llvm Tue Mar 23 17:15:33 2010
>> @@ -203,6 +203,7 @@
>>  make $JOBS_FLAG $OPTIMIZE_OPTS UNIVERSAL=1 UNIVERSAL_ARCH="$TARGETS" \
>>     UNIVERSAL_SDK_PATH=$HOST_SDKROOT \
>>     NO_RUNTIME_LIBS=1 \
>> +    DISABLE_EDIS=1 \
>>     LLVM_SUBMIT_VERSION=$LLVM_SUBMIT_VERSION \
>>     LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION \
>>     CXXFLAGS="-DLLVM_VERSION_INFO='\" Apple Build #$LLVM_VERSION\"'" \
>> @@ -227,6 +228,7 @@
>>  # Install the tree into the destination directory.
>>  make $LOCAL_MAKEFLAGS $OPTIMIZE_OPTS UNIVERSAL=1 UNIVERSAL_ARCH="$TARGETS" \
>>     NO_RUNTIME_LIBS=1 \
>> +    DISABLE_EDIS=1 \
>>     LLVM_SUBMIT_VERSION=$LLVM_SUBMIT_VERSION \
>>     LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION \
>>     OPTIMIZE_OPTION='-O3' VERBOSE=1 install
>> 
>> 
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>