[cfe-commits] r165103 - in /cfe/trunk: Makefile tools/Makefile

[Bill Wendling]

Author: void
Date: Wed Oct  3 03:39:19 2012
New Revision: 165103

URL: http://llvm.org/viewvc/llvm-project?rev=165103&view=rev
Log:
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.

Modified:
    cfe/trunk/Makefile
    cfe/trunk/tools/Makefile

Modified: cfe/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Makefile?rev=165103&r1=165102&r2=165103&view=diff
==============================================================================
--- cfe/trunk/Makefile (original)
+++ cfe/trunk/Makefile Wed Oct  3 03:39:19 2012
@@ -28,8 +28,7 @@
   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
 

Modified: cfe/trunk/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/Makefile?rev=165103&r1=165102&r2=165103&view=diff
==============================================================================
--- cfe/trunk/tools/Makefile (original)
+++ cfe/trunk/tools/Makefile Wed Oct  3 03:39:19 2012
@@ -17,4 +17,9 @@
 # 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