[llvm-commits] [llvm] r64285 - in /llvm/trunk/tools: Makefile lto/Makefile

[Nick Lewycky]

Devang Patel wrote:
> Author: dpatel
> Date: Tue Feb 10 20:34:33 2009
> New Revision: 64285
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=64285&view=rev
> Log:
> 62987 disables LTO build on darwin.
> Revert 62987 for now. Nicolas please investigate.

Interesting! I thought darwin builds PIC by default. Why isn't it 
setting ENABLE_PIC?

Regardless, I'll fix this shortly...

> 
> Modified:
>     llvm/trunk/tools/Makefile
>     llvm/trunk/tools/lto/Makefile
> 
> Modified: llvm/trunk/tools/Makefile
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/Makefile?rev=64285&r1=64284&r2=64285&view=diff
> 
> ==============================================================================
> --- llvm/trunk/tools/Makefile (original)
> +++ llvm/trunk/tools/Makefile Tue Feb 10 20:34:33 2009
> @@ -25,7 +25,8 @@
>  
>  include $(LEVEL)/Makefile.config
>  
> -ifeq ($(ENABLE_PIC),1)
> +# only build new lto project on Darwin for now
> +ifeq ($(OS),Darwin)
>  PARALLEL_DIRS += lto
>  
>  ifdef BINUTILS_INCDIR
> 
> Modified: llvm/trunk/tools/lto/Makefile
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/Makefile?rev=64285&r1=64284&r2=64285&view=diff
> 
> ==============================================================================
> --- llvm/trunk/tools/lto/Makefile (original)
> +++ llvm/trunk/tools/lto/Makefile Tue Feb 10 20:34:33 2009
> @@ -16,8 +16,12 @@
>  include $(LEVEL)/Makefile.config
>  
>  LINK_LIBS_IN_SHARED = 1
> -SHARED_LIBRARY = 1
> -DONT_BUILD_RELINKED = 1
> +ifeq ($(OS),Darwin)
> +  SHARED_LIBRARY = 1
> +  DONT_BUILD_RELINKED = 1
> +else
> +  BUILD_ARCHIVE = 1
> +endif

How on Earth did this break anything? All I changed was to make it as if 
OS=Darwin was always true...

I'm going to assume that it didn't, and you just backed out the whole 
revision (makes sense to me), and revert your reversion of this file...

Nick

>  
>  LINK_COMPONENTS := $(TARGETS_TO_BUILD) ipo scalaropts linker bitreader bitwriter
>  
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>