[llvm-commits] [test-suite] r96937 - in /test-suite/trunk: Makefile.config.in Makefile.rules

[Daniel Dunbar]

Author: ddunbar
Date: Tue Feb 23 04:48:51 2010
New Revision: 96937

URL: http://llvm.org/viewvc/llvm-project?rev=96937&view=rev
Log:
Switch llvm-test-suite to using LLVM{CC,CXX}.

Modified:
    test-suite/trunk/Makefile.config.in
    test-suite/trunk/Makefile.rules

Modified: test-suite/trunk/Makefile.config.in
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.config.in?rev=96937&r1=96936&r2=96937&view=diff
==============================================================================
--- test-suite/trunk/Makefile.config.in (original)
+++ test-suite/trunk/Makefile.config.in Tue Feb 23 04:48:51 2010
@@ -45,10 +45,14 @@
 
 ifdef TARGET_LLVMGCC
 LLVMGCC := $(TARGET_LLVMGCC)
+LLVMCC := $(TARGET_LLVMGCC)
+LLVMCC_OPTION := llvm-gcc
 endif
 
 ifdef TARGET_LLVMGXX
 LLVMGXX := $(TARGET_LLVMGXX)
+LLVMCXX := $(TARGET_LLVMGXX)
+LLVMCC_OPTION := llvm-gcc
 endif
 
 ifeq ($(ARCH),THUMB)

Modified: test-suite/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.rules?rev=96937&r1=96936&r2=96937&view=diff
==============================================================================
--- test-suite/trunk/Makefile.rules (original)
+++ test-suite/trunk/Makefile.rules Tue Feb 23 04:48:51 2010
@@ -248,6 +248,29 @@
 LIBTOOL += --silent
 endif
 
+#--------------------------------------------------------------------
+# LLVM Capable Compiler
+#--------------------------------------------------------------------
+
+# FIXME: We shouldn't need to duplicate this from LLVM's Makefile.rules.
+
+ifeq ($(LLVMCC_OPTION),llvm-gcc)
+  LLVMCC := $(LLVMGCC)
+  LLVMCXX := $(LLVMGXX)
+else
+  ifeq ($(LLVMCC_OPTION),clang)
+    ifneq ($(CLANGPATH),)
+      LLVMCC := $(CLANGPATH)
+      LLVMCXX := $(CLANGXXPATH)
+    else
+      ifeq ($(ENABLE_BUILT_CLANG),1)
+        LLVMCC := $(LLVMTOOLCURRENT)/clang
+        LLVMCXX := $(LLVMTOOLCURRENT)/clang++
+      endif
+    endif
+  endif
+endif
+
 ###########################################################################
 # Miscellaneous paths and commands (part deux):
 #	This section defines various configuration macros, such as where
@@ -271,9 +294,12 @@
 LBUGPOINT = $(LLVMTOOLCURRENT)/bugpoint$(EXEEXT)
 LFINDMISOPT= $(LLVM_SRC_ROOT)/utils/findmisopt
 
-LCC := $(LLVMGCC)
-LCXX := $(LLVMGXX)
-LCC_PROGRAMS := $(LCC) $(LCXX) $(LLVMCC1) $(LLVMCC1PLUS)
+LCC := $(LLVMCC)
+LCXX := $(LLVMCXX)
+LCC_PROGRAMS := $(LCC) $(LCXX)
+ifeq ($(LLVMCC_OPTION),llvm-gcc)
+  LCC_PROGRAMS += $(LLVMCC1) $(LLVMCC1PLUS)
+endif
 
 
 ###########################################################################