aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile5
-rw-r--r--tools/lto/Makefile8
2 files changed, 8 insertions, 5 deletions
diff --git a/tools/Makefile b/tools/Makefile
index 471cdd0..a296f81 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -25,11 +25,10 @@ PARALLEL_DIRS := llvm-config \
include $(LEVEL)/Makefile.config
-# build lto project on Darwin or if PIC is enabled
+# only build new lto project on Darwin for now
ifeq ($(OS),Darwin)
PARALLEL_DIRS += lto
-else ($(ENABLE_PIC),1)
-PARALLEL_DIRS += lto
+
ifdef BINUTILS_INCDIR
PARALLEL_DIRS += gold
endif
diff --git a/tools/lto/Makefile b/tools/lto/Makefile
index f0f6da7..69014d7 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