The top-level clang Makefile is #included into other Makefiles. (sigh) So we

can't have the logic here to add in the 'tools/{driver,libclang}' directories,
because they will be added in for ALL Makefiles which #include the top-level
one. Place the logic into the 'tools' Makefile.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165103 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile b/Makefile
index 2ffe3597a96fd40c2caee55f901cedf222063130..cb2566a0a17d2fa6b30b90d89d79bd9f3915c510 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,8 +28,7 @@ ifeq ($(MAKECMDGOALS),libs-only)
   OPTIONAL_DIRS :=
 endif
 ifeq ($(BUILD_CLANG_ONLY),YES)
-  DIRS := $(filter-out tools docs unittests, $(DIRS)) \
-          tools/driver tools/libclang
+  DIRS := $(filter-out docs unittests, $(DIRS))
   OPTIONAL_DIRS :=
 endif
 

diff --git a/tools/Makefile b/tools/Makefile
index e7aa2fa4ffa0a8a21cb5bf5c35082a477266f0ef..b2a9f36f8e0baf4e6c3bb5318010041596e55f9f 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -17,4 +17,9 @@ DIRS := driver libclang c-index-test arcmt-test c-arcmt-test diagtool \
 # Recurse into the extra repository of tools if present.
 OPTIONAL_DIRS := extra
 
+ifeq ($(BUILD_CLANG_ONLY),YES)
+  DIRS := tools/driver tools/libclang
+  OPTIONAL_DIRS :=
+endif
+
 include $(CLANG_LEVEL)/Makefile