diff options
author | Chris Lattner <sabre@nondot.org> | 2010-03-05 00:59:18 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2010-03-05 00:59:18 +0000 |
commit | 23e6d2b88a34e4a7aea9120446683c598da470d7 (patch) | |
tree | 27873fa1e6eaec89326eafa404f419993f7d4a86 /tools | |
parent | f6dc18f9eb0feaf398ba372f0e01ec7abf013722 (diff) | |
download | external_llvm-23e6d2b88a34e4a7aea9120446683c598da470d7.zip external_llvm-23e6d2b88a34e4a7aea9120446683c598da470d7.tar.gz external_llvm-23e6d2b88a34e4a7aea9120446683c598da470d7.tar.bz2 |
Only build libedis if ENABLE_SHARED is specified, just like liblto.
Don't build any of the dynamic library stuff on cygwin/mingw.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@97771 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Makefile | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/tools/Makefile b/tools/Makefile index 2db84c6..64179fd 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -21,8 +21,8 @@ PARALLEL_DIRS := opt llvm-as llvm-dis \ llvm-ld llvm-prof llvm-link \ lli llvm-extract \ bugpoint llvm-bcanalyzer llvm-stub \ - llvm-mc llvmc \ - edis + llvm-mc llvmc + # Let users override the set of tools to build from the command line. ifdef ONLY_TOOLS @@ -32,18 +32,19 @@ endif include $(LEVEL)/Makefile.config +# These libraries build as dynamic libraries (.dylib /.so), they can only be +# built if ENABLE_PIC is set. ifeq ($(ENABLE_PIC),1) - PARALLEL_DIRS += lto - ifdef BINUTILS_INCDIR - PARALLEL_DIRS += gold + # No support for dynamic libraries on windows targets. + ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW)) + PARALLEL_DIRS += lto edis + # gold only builds if binutils is around. + ifdef BINUTILS_INCDIR + PARALLEL_DIRS += gold + endif endif endif -# No support for lto / gold on windows targets -ifeq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW)) - PARALLEL_DIRS := $(filter-out lto gold, $(DIRS)) -endif - # Only build edis if X86 target support is enabled. ifeq ($(filter $(TARGETS_TO_BUILD), X86),) PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS)) |