diff options
| author | Devang Patel <dpatel@apple.com> | 2009-02-11 02:34:33 +0000 |
|---|---|---|
| committer | Devang Patel <dpatel@apple.com> | 2009-02-11 02:34:33 +0000 |
| commit | e8118343dcf1b3610eb0b9f6edab1b224f6ecd0d (patch) | |
| tree | 130568437034a977880754910bd86678c5f83313 | |
| parent | e8fed404c092f0e544ae008d9b42da36316d2f23 (diff) | |
| download | external_llvm-e8118343dcf1b3610eb0b9f6edab1b224f6ecd0d.zip external_llvm-e8118343dcf1b3610eb0b9f6edab1b224f6ecd0d.tar.gz external_llvm-e8118343dcf1b3610eb0b9f6edab1b224f6ecd0d.tar.bz2 | |
62987 disables LTO build on darwin.
Revert 62987 for now. Nicolas please investigate.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@64285 91177308-0d34-0410-b5e6-96231b3b80d8
| -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 0cf613a..a296f81 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 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 |