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

diff --git a/tools/Makefile b/tools/Makefile
index dad767cf45990fc1f052a398b634b7ce0ec3cb1a..e7aa2fa4ffa0a8a21cb5bf5c35082a477266f0ef 100644 (file)
--- 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