[llvm-commits] [llvm] r84507 - in /llvm/trunk: Makefile utils/buildit/GNUmakefile utils/buildit/build_llvm

[Daniel Dunbar]

I went ahead and reverted this for now.

 - Daniel

On Mon, Oct 19, 2009 at 2:12 PM, Daniel Dunbar <daniel at zuster.org> wrote:
> Hi Stuart,
>
> This is breaking Clang's Apple style build, see our projects builder.
>
> Can you find another solution, or perhaps limit this to only affect
> the LLVM build?
>
>  - Daniel
>
> On Mon, Oct 19, 2009 at 10:53 AM, Stuart Hastings <stuart at apple.com> wrote:
>> Author: stuart
>> Date: Mon Oct 19 12:53:54 2009
>> New Revision: 84507
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=84507&view=rev
>> Log:
>> Tweak top-level Makefile to facilitate Apple-style build.
>>
>> Modified:
>>    llvm/trunk/Makefile
>>    llvm/trunk/utils/buildit/GNUmakefile
>>    llvm/trunk/utils/buildit/build_llvm
>>
>> Modified: llvm/trunk/Makefile
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile?rev=84507&r1=84506&r2=84507&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/Makefile (original)
>> +++ llvm/trunk/Makefile Mon Oct 19 12:53:54 2009
>> @@ -19,6 +19,7 @@
>>  #
>>  # When cross-compiling, there are some things (tablegen) that need to
>>  # be build for the build system first.
>> +ifndef RC_ARCHS  # Normal build (not "Apple-style").
>>  ifeq ($(BUILD_DIRS_ONLY),1)
>>   DIRS := lib/System lib/Support utils
>>   OPTIONAL_DIRS :=
>> @@ -211,3 +212,8 @@
>>
>>  .NOTPARALLEL:
>>
>> +else # Building "Apple-style."
>> +# N.B. In an Apple-style build, once configuration is done, lines
>> +# marked "Apple-style" are removed with sed!  See utils/buildit/build_llvm.
>> +include utils/buildit/GNUmakefile # Building "Apple-style."
>> +endif # Building "Apple-style."
>>
>> Modified: llvm/trunk/utils/buildit/GNUmakefile
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/buildit/GNUmakefile?rev=84507&r1=84506&r2=84507&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/utils/buildit/GNUmakefile (original)
>> +++ llvm/trunk/utils/buildit/GNUmakefile Mon Oct 19 12:53:54 2009
>> @@ -59,7 +59,7 @@
>>  # NOTE : Always put version numbers at the end because they are optional.
>>  install: $(OBJROOT) $(SYMROOT) $(DSTROOT)
>>        cd $(OBJROOT) && \
>> -         $(SRC)/build_llvm "$(RC_ARCHS)" "$(TARGETS)" \
>> +         $(SRC)/utils/buildit/build_llvm "$(RC_ARCHS)" "$(TARGETS)" \
>>            $(SRC) $(PREFIX) $(DSTROOT) $(SYMROOT) \
>>            $(LLVM_ASSERTIONS) $(LLVM_OPTIMIZED) \
>>            $(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion)
>>
>> Modified: llvm/trunk/utils/buildit/build_llvm
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/buildit/build_llvm?rev=84507&r1=84506&r2=84507&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/utils/buildit/build_llvm (original)
>> +++ llvm/trunk/utils/buildit/build_llvm Mon Oct 19 12:53:54 2009
>> @@ -82,6 +82,10 @@
>>  rm -rf $SRC_DIR || exit 1
>>  mkdir $SRC_DIR || exit 1
>>  ln -s $ORIG_SRC_DIR/* $SRC_DIR/ || exit 1
>> +# We can't use the top-level Makefile as-is.  Remove the soft link:
>> +rm $SRC_DIR/Makefile || exit 1
>> +# Now create our own by editing the top-level Makefile, deleting every line marked "Apple-style":
>> +sed -e '/[Aa]pple-style/d' -e '/include.*GNUmakefile/d' $ORIG_SRC_DIR/Makefile > $SRC_DIR/Makefile || exit 1
>>
>>  # Build the LLVM tree universal.
>>  mkdir -p $DIR/obj-llvm || exit 1
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>
>