aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2012-08-09 20:21:38 +0000
committerChandler Carruth <chandlerc@gmail.com>2012-08-09 20:21:38 +0000
commitaf310b1c7e3136eda858b9e6309cd21b90f85850 (patch)
tree2aefc31d22b200b221668a5c9129e6f0dfd607fd
parent950435c15e413c55859f8af78d2c6e603743b42f (diff)
Recurse into the extra tools repo the correct way from the Makefile
build system. Thanks to Nick for pointing at the actual construct which should be used here. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@161609 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--tools/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/Makefile b/tools/Makefile
index dad767cf45..e7aa2fa4ff 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -9,9 +9,12 @@
CLANG_LEVEL := ..
+include $(CLANG_LEVEL)/../../Makefile.config
+
DIRS := driver libclang c-index-test arcmt-test c-arcmt-test diagtool \
- clang-check $(patsubst %/Makefile,%,$(wildcard extra/Makefile))
+ clang-check
-include $(CLANG_LEVEL)/../../Makefile.config
+# Recurse into the extra repository of tools if present.
+OPTIONAL_DIRS := extra
include $(CLANG_LEVEL)/Makefile