[llvm] r184793 - Remove all non-linker oriented compile options from the linker

[Bob Wilson]

This broke one of Apple’s buildbots.  I have tried to get it going again by adding CXXFLAGS back to the link command in r185060.  I still need to confirm that it actually fixes the buildbot.  Assuming that it does, will that work for you, Eric?  It wasn’t clear from your commit message why you changed this, so I don’t know what your constraints are.

On Jun 24, 2013, at 4:20 PM, Eric Christopher <echristo at gmail.com> wrote:

> Author: echristo
> Date: Mon Jun 24 18:20:04 2013
> New Revision: 184793
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=184793&view=rev
> Log:
> Remove all non-linker oriented compile options from the linker
> command line. Change the darwin universal binary options to
> be TargetCommonOpts so that they'll be passed to the linker since
> -arch at least is still needed.
> 
> Someone on darwin with a buildit based build should probably verify
> that this doesn't break anything there.
> 
> Modified:
>    llvm/trunk/Makefile.rules
> 
> Modified: llvm/trunk/Makefile.rules
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=184793&r1=184792&r2=184793&view=diff
> ==============================================================================
> --- llvm/trunk/Makefile.rules (original)
> +++ llvm/trunk/Makefile.rules Mon Jun 24 18:20:04 2013
> @@ -691,9 +691,9 @@ ifdef UNIVERSAL
>     UNIVERSAL_ARCH := i386 ppc
>   endif
>   UNIVERSAL_ARCH_OPTIONS := $(UNIVERSAL_ARCH:%=-arch %)
> -  CompileCommonOpts += $(UNIVERSAL_ARCH_OPTIONS)
> +  TargetCommonOpts += $(UNIVERSAL_ARCH_OPTIONS)
>   ifdef UNIVERSAL_SDK_PATH
> -    CompileCommonOpts += -isysroot $(UNIVERSAL_SDK_PATH)
> +    TargetCommonOpts += -isysroot $(UNIVERSAL_SDK_PATH)
>   endif
> 
>   # Building universal cannot compute dependencies automatically.
> @@ -755,8 +755,7 @@ Preprocess.CXX= $(Compile.Wrapper) \
> 	          $(CXX) $(CPP.Flags) $(TargetCommonOpts) $(CPPFLAGS) \
>                 $(CompileCommonOpts) $(CXX.Flags) -E
> Link          = $(Compile.Wrapper) \
> -	          $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) $(LD.Flags) \
> -                $(LDFLAGS) $(TargetCommonOpts)  $(CompileCommonOpts) $(Strip)
> +	          $(CXX) $(LD.Flags) $(LDFLAGS) $(TargetCommonOpts) $(Strip)
> 
> BCCompile.C   = $(LLVMCC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \
>                 $(TargetCommonOpts) $(CompileCommonOpts)
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20130626/3cfb95d9/attachment.html>