Extend SimplifyCFG's common-destination folding heuristic to allow a single

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index 643d9c20d061a651432eb2ea21d206548f894c50..d42f887b6b18f175c3a094e4036917358b275482 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -64,14 +64,14 @@ endif
 
 ifeq ($(MAKECMDGOALS),install-clang)
   DIRS := tools/clang/tools/driver tools/clang/lib/Headers \
-          tools/clang/lib/Runtime tools/clang/docs
+          tools/clang/runtime tools/clang/docs
   OPTIONAL_DIRS :=
   NO_INSTALL = 1
 endif
 
 ifeq ($(MAKECMDGOALS),install-clang-c)
   DIRS := tools/clang/tools/driver tools/clang/lib/Headers \
-          tools/clang/tools/CIndex tools/clang/tools/c-index-test \
+          tools/clang/tools/libclang tools/clang/tools/c-index-test \
          tools/clang/include/clang-c
   OPTIONAL_DIRS :=
   NO_INSTALL = 1
@@ -180,8 +180,8 @@ $(FilesToConfigPATH) : $(LLVM_OBJ_ROOT)/% : $(LLVM_SRC_ROOT)/%.in
 # that it gets executed last.
 ifneq ($(BUILD_DIRS_ONLY),1)
 all::
-       $(Echo) '*****' Completed $(BuildMode)$(AssertMode) Build
-ifeq ($(BuildMode),Debug)
+       $(Echo) '*****' Completed $(BuildMode) Build
+ifneq ($(ENABLE_OPTIMIZED),1)
        $(Echo) '*****' Note: Debug build can be 10 times slower than an
        $(Echo) '*****' optimized build. Use 'make ENABLE_OPTIMIZED=1' to
        $(Echo) '*****' make an optimized build. Alternatively you can