diff options
| author | Tanya Lattner <tonic@nondot.org> | 2009-02-20 17:47:45 +0000 |
|---|---|---|
| committer | Tanya Lattner <tonic@nondot.org> | 2009-02-20 17:47:45 +0000 |
| commit | 12229cf64d8995cd9afb5c678d5fbe86b6c09e52 (patch) | |
| tree | 0bc2918ad4271d6c8d53ad9819c8cb9392892bf9 | |
| parent | f041a9ea1b8b0eb32883d52a859b2d2afa1a4c6d (diff) | |
| download | llvm-12229cf64d8995cd9afb5c678d5fbe86b6c09e52.tar.gz | |
Revert 62987. This is already reverted in mainline.
llvm-svn: 65125
| -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 909a54843b5d..519717ad98de 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 endif diff --git a/llvm/tools/lto/Makefile b/llvm/tools/lto/Makefile index f0f6da7191a2..69014d781ff1 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 |