diff options
| author | Bill Wendling <isanbard@gmail.com> | 2012-10-03 08:39:19 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2012-10-03 08:39:19 +0000 |
| commit | 2bf8980800fb282f61401b44a678064ebac13038 (patch) | |
| tree | 330ae78bf4790982f76aa752ff62040d12adbb03 | |
| parent | 4f0b2d1e2548b6966ebc98906a621222ecfb3086 (diff) | |
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
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | tools/Makefile | 5 |
2 files changed, 6 insertions, 2 deletions
@@ -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 e7aa2fa4ff..b2a9f36f8e 100644 --- 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 |