[llvm-branch-commits] [llvm-branch] r217640 - Merging r217490:

[Dan Liew]

Author: delcypher
Date: Thu Sep 11 18:00:09 2014
New Revision: 217640

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

Modified:
    llvm/branches/release_35/cmake/modules/Makefile

Modified: llvm/branches/release_35/cmake/modules/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/cmake/modules/Makefile?rev=217640&r1=217639&r2=217640&view=diff
==============================================================================
--- llvm/branches/release_35/cmake/modules/Makefile (original)
+++ llvm/branches/release_35/cmake/modules/Makefile Thu Sep 11 18:00:09 2014
@@ -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