aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2012-08-09 21:02:52 +0000
committerChandler Carruth <chandlerc@gmail.com>2012-08-09 21:02:52 +0000
commit20316a948e293132d15af069bc35af859567b89d (patch)
tree06cc04796d6ea341e34ecc01d2c1a4a69954dd6f
parentd4fe57f7f7a8793227effc1274d70ec44cee9a4f (diff)
Temporarily revert r161612 while we figure out just what the semantics
of PARALLEL_DIRS are. They apparantly aren't what either Nick, Eric, or I thought. ;] Should let the bots make forward progress. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@161618 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--tools/Makefile9
1 files changed, 3 insertions, 6 deletions
diff --git a/tools/Makefile b/tools/Makefile
index 0bae772a97..e7aa2fa4ff 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -11,13 +11,10 @@ CLANG_LEVEL := ..
include $(CLANG_LEVEL)/../../Makefile.config
-# Build libclang first so that other tools can depend on it.
-DIRS := libclang
-
-PARALLEL_DIRS := driver c-index-test arcmt-test c-arcmt-test diagtool \
- clang-check
+DIRS := driver libclang c-index-test arcmt-test c-arcmt-test diagtool \
+ clang-check
# Recurse into the extra repository of tools if present.
-PARALLEL_OPTIONAL_DIRS := extra
+OPTIONAL_DIRS := extra
include $(CLANG_LEVEL)/Makefile