diff options
| author | Duncan Sands <baldrick@free.fr> | 2009-02-11 13:23:49 +0000 |
|---|---|---|
| committer | Duncan Sands <baldrick@free.fr> | 2009-02-11 13:23:49 +0000 |
| commit | 185fc298204a1c85c10dcc28f9db4e7aafa95b50 (patch) | |
| tree | 1fb6d1a4d474e6aa8ff186b485ff74151eb910bf /llvm/tools | |
| parent | 5b3349064d7d381c88f8bed50574a3f1284986d0 (diff) | |
| download | bcm5719-llvm-185fc298204a1c85c10dcc28f9db4e7aafa95b50.tar.gz bcm5719-llvm-185fc298204a1c85c10dcc28f9db4e7aafa95b50.zip | |
Revert r64299: it breaks the build when configured
without --enable-pic, like my nightly tester.
llvm-svn: 64302
Diffstat (limited to 'llvm/tools')
| -rw-r--r-- | llvm/tools/Makefile | 5 | ||||
| -rw-r--r-- | llvm/tools/lto/Makefile | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/llvm/tools/Makefile b/llvm/tools/Makefile index 471cdd0c2de..a296f818702 100644 --- a/llvm/tools/Makefile +++ b/llvm/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/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 |
