summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJeffrey Yasskin <jyasskin@google.com>2010-02-25 06:34:33 +0000
committerJeffrey Yasskin <jyasskin@google.com>2010-02-25 06:34:33 +0000
commitc90171961d020d93e4ce548016d8ccb8aab00c57 (patch)
tree639ac8f1a8273a2563895bed7d55bd60fbff5f46 /Makefile
parente6ba0b576231ad3af599d1985dad370e59d954f9 (diff)
Try r96559 for the third time. This time the shared library is only built if
--enable-shared is passed to configure. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@97119 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 20395e9470d..f5a9b336e37 100644
--- a/Makefile
+++ b/Makefile
@@ -30,8 +30,8 @@ ifeq ($(BUILD_DIRS_ONLY),1)
DIRS := lib/System lib/Support utils
OPTIONAL_DIRS :=
else
- DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-config \
- tools runtime docs unittests
+ DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-shlib \
+ tools/llvm-config tools runtime docs unittests
OPTIONAL_DIRS := projects bindings
endif
@@ -43,6 +43,10 @@ EXTRA_DIST := test unittests llvm.spec include win32 Xcode
include $(LEVEL)/Makefile.config
+ifneq ($(ENABLE_SHARED),1)
+ DIRS := $(filter-out tools/llvm-shlib, $(DIRS))
+endif
+
ifeq ($(MAKECMDGOALS),libs-only)
DIRS := $(filter-out tools runtime docs, $(DIRS))
OPTIONAL_DIRS :=