Merging r217490:

------------------------------------------------------------------------
r217490 | delcypher | 2014-09-10 12:09:23 +0100 (Wed, 10 Sep 2014) | 4 lines

Don't attempt to run llvm-config in cmake/modules/Makefile when doing
``make clean`` because it won't be available.

This is an attempt to unbreak buildbots broken by r217484.
------------------------------------------------------------------------

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_35@217640 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/cmake/modules/Makefile b/cmake/modules/Makefile
index 1ec5b190b35164d412fe70b0b38ebd72c83f300d..dd31aa7926cfe8962eb67344f538b2941ad49fd2 100644 (file)
--- a/cmake/modules/Makefile
+++ b/cmake/modules/Makefile
@@ -33,6 +33,8 @@ else
        LLVM_ENABLE_RTTI := 0
 endif
 
+# Don't try to run llvm-config during clean because it won't be available
+ifneq ($(MAKECMDGOALS),clean)
 LLVM_LIBS_TO_EXPORT := $(subst -l,,$(shell $(LLVM_CONFIG) --libs $(LINK_COMPONENTS) || echo Error))
 
 ifeq ($(LLVM_LIBS_TO_EXPORT),Error)
@@ -42,6 +44,7 @@ endif
 ifndef LLVM_LIBS_TO_EXPORT
 $(error LLVM_LIBS_TO_EXPORT cannot be empty)
 endif
+endif
 
 OBJMODS := LLVMConfig.cmake LLVMConfigVersion.cmake LLVMExports.cmake