[llvm-commits] [llvm] r129229 - /llvm/trunk/Makefile.rules

Chris Lattner sabre at nondot.org
Sat Apr 9 12:53:16 PDT 2011


Author: lattner
Date: Sat Apr  9 14:53:16 2011
New Revision: 129229

URL: http://llvm.org/viewvc/llvm-project?rev=129229&view=rev
Log:
make stuff work when LLVMCC_OPTION is something like installed-clang, not just clang.

Modified:
    llvm/trunk/Makefile.rules

Modified: llvm/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=129229&r1=129228&r2=129229&view=diff
==============================================================================
--- llvm/trunk/Makefile.rules (original)
+++ llvm/trunk/Makefile.rules Sat Apr  9 14:53:16 2011
@@ -444,11 +444,11 @@
 # LLVM Capable Compiler
 #--------------------------------------------------------------------
 
-ifeq ($(LLVMCC_OPTION),llvm-gcc)
+ifneq ($(findstring llvm-gcc,$(LLVMCC_OPTION)),)
   LLVMCC := $(LLVMGCC)
   LLVMCXX := $(LLVMGXX)
 else
-  ifeq ($(LLVMCC_OPTION),clang)
+  ifneq ($(findstring clang,$(LLVMCC_OPTION)),)
     ifneq ($(CLANGPATH),)
       LLVMCC := $(CLANGPATH)
       LLVMCXX := $(CLANGXXPATH)





More information about the llvm-commits mailing list