diff options
| -rw-r--r-- | tools/Makefile | 3 | ||||
| -rw-r--r-- | tools/lto/Makefile | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/tools/Makefile b/tools/Makefile index 0cf613a305..a296f81870 100644 --- a/tools/Makefile +++ b/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/tools/lto/Makefile b/tools/lto/Makefile index f0f6da7191..69014d781f 100644 --- a/tools/lto/Makefile +++ b/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 |