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.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@65518 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Nick Lewycky 2009-02-26 07:56:49 +00:00
parent a15dc035a6
commit dcd158af27
3 changed files with 10 additions and 16 deletions

View File

@ -15,23 +15,20 @@ OPTIONAL_PARALLEL_DIRS := clang
# NOTE: The tools are organized into five groups of four consisting of one # 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 # large and three small executables. This is done to minimize memory load
# in parallel builds. Please retain this ordering. # in parallel builds. Please retain this ordering.
PARALLEL_DIRS := llvm-config \ DIRS := llvm-config
opt llvm-as llvm-dis \ PARALLEL_DIRS := opt llvm-as llvm-dis \
llc llvm-ranlib llvm-ar llvm-nm \ llc llvm-ranlib llvm-ar llvm-nm \
llvm-ld llvm-prof llvm-link \ llvm-ld llvm-prof llvm-link \
lli gccas gccld llvm-extract llvm-db \ lli gccas gccld llvm-extract llvm-db \
bugpoint llvm-bcanalyzer llvm-stub llvmc bugpoint llvm-bcanalyzer llvm-stub llvmc
include $(LEVEL)/Makefile.config include $(LEVEL)/Makefile.config
# only build new lto project on Darwin for now ifdef ENABLE_PIC
ifeq ($(OS),Darwin) DIRS += lto
PARALLEL_DIRS += lto ifdef BINUTILS_INCDIR
DIRS += gold
ifdef BINUTILS_INCDIR endif
PARALLEL_DIRS += gold
endif
endif endif
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

@ -21,6 +21,7 @@ BUILD_ARCHIVE = 0
DONT_BUILD_RELINKED = 1 DONT_BUILD_RELINKED = 1
LINK_COMPONENTS := LINK_COMPONENTS :=
LIBS += -llto
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

@ -16,12 +16,8 @@ LIBRARYNAME = LTO
include $(LEVEL)/Makefile.config include $(LEVEL)/Makefile.config
LINK_LIBS_IN_SHARED = 1 LINK_LIBS_IN_SHARED = 1
ifeq ($(OS),Darwin) SHARED_LIBRARY = 1
SHARED_LIBRARY = 1 DONT_BUILD_RELINKED = 1
DONT_BUILD_RELINKED = 1
else
BUILD_ARCHIVE = 1
endif
LINK_COMPONENTS := $(TARGETS_TO_BUILD) ipo scalaropts linker bitreader bitwriter LINK_COMPONENTS := $(TARGETS_TO_BUILD) ipo scalaropts linker bitreader bitwriter