diff options
Diffstat (limited to 'llvm/tools')
| -rw-r--r-- | llvm/tools/Makefile | 3 | ||||
| -rw-r--r-- | llvm/tools/lto/Makefile | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/llvm/tools/Makefile b/llvm/tools/Makefile index 0cf613a3058..a296f818702 100644 --- a/llvm/tools/Makefile +++ b/llvm/tools/Makefile @@ -25,7 +25,8 @@ PARALLEL_DIRS := llvm-config \ 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 diff --git a/llvm/tools/lto/Makefile b/llvm/tools/lto/Makefile index f0f6da7191a..69014d781ff 100644 --- a/llvm/tools/lto/Makefile +++ b/llvm/tools/lto/Makefile @@ -16,8 +16,12 @@ LIBRARYNAME = LTO 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 LINK_COMPONENTS := $(TARGETS_TO_BUILD) ipo scalaropts linker bitreader bitwriter |
