diff options
| author | Nick Lewycky <nicholas@mxc.ca> | 2009-02-26 07:56:49 +0000 |
|---|---|---|
| committer | Nick Lewycky <nicholas@mxc.ca> | 2009-02-26 07:56:49 +0000 |
| commit | 5eb3773b99080d4af8d73dfdbaa4293bb3497e6f (patch) | |
| tree | fb8b597957d00f6ac70b98cbd36247a94e4bc545 | |
| parent | 28c62d211a63700aed632b643aa29dd3a49c559b (diff) | |
| download | bcm5719-llvm-5eb3773b99080d4af8d73dfdbaa4293bb3497e6f.tar.gz bcm5719-llvm-5eb3773b99080d4af8d73dfdbaa4293bb3497e6f.zip | |
Force 'llvm-config' to go first, optionally followed by lto and gold mixed in
with the rest of the parallel directories.
Build lto when possible on all platforms. Make gold to explicitly depend on
libLTO.
llvm-svn: 65518
| -rw-r--r-- | llvm/tools/Makefile | 17 | ||||
| -rw-r--r-- | llvm/tools/gold/Makefile | 1 | ||||
| -rw-r--r-- | llvm/tools/lto/Makefile | 8 |
3 files changed, 10 insertions, 16 deletions
diff --git a/llvm/tools/Makefile b/llvm/tools/Makefile index a296f818702..7305f6bafeb 100644 --- a/llvm/tools/Makefile +++ b/llvm/tools/Makefile @@ -15,23 +15,20 @@ OPTIONAL_PARALLEL_DIRS := clang # NOTE: The tools are organized into five groups of four consisting of one # large and three small executables. This is done to minimize memory load # in parallel builds. Please retain this ordering. -PARALLEL_DIRS := llvm-config \ - opt llvm-as llvm-dis \ +DIRS := llvm-config +PARALLEL_DIRS := opt llvm-as llvm-dis \ llc llvm-ranlib llvm-ar llvm-nm \ llvm-ld llvm-prof llvm-link \ lli gccas gccld llvm-extract llvm-db \ bugpoint llvm-bcanalyzer llvm-stub llvmc - include $(LEVEL)/Makefile.config -# only build new lto project on Darwin for now -ifeq ($(OS),Darwin) -PARALLEL_DIRS += lto - -ifdef BINUTILS_INCDIR -PARALLEL_DIRS += gold -endif +ifdef ENABLE_PIC + DIRS += lto + ifdef BINUTILS_INCDIR + DIRS += gold + endif endif include $(LEVEL)/Makefile.common diff --git a/llvm/tools/gold/Makefile b/llvm/tools/gold/Makefile index 37a7e4ef7fc..eccffcbda6b 100644 --- a/llvm/tools/gold/Makefile +++ b/llvm/tools/gold/Makefile @@ -21,6 +21,7 @@ BUILD_ARCHIVE = 0 DONT_BUILD_RELINKED = 1 LINK_COMPONENTS := +LIBS += -llto include $(LEVEL)/Makefile.common diff --git a/llvm/tools/lto/Makefile b/llvm/tools/lto/Makefile index 69014d781ff..f0f6da7191a 100644 --- a/llvm/tools/lto/Makefile +++ b/llvm/tools/lto/Makefile @@ -16,12 +16,8 @@ LIBRARYNAME = LTO include $(LEVEL)/Makefile.config LINK_LIBS_IN_SHARED = 1 -ifeq ($(OS),Darwin) - SHARED_LIBRARY = 1 - DONT_BUILD_RELINKED = 1 -else - BUILD_ARCHIVE = 1 -endif +SHARED_LIBRARY = 1 +DONT_BUILD_RELINKED = 1 LINK_COMPONENTS := $(TARGETS_TO_BUILD) ipo scalaropts linker bitreader bitwriter |
