[Lldb-commits] [lldb] r115169 - in /lldb/trunk/test: dotest.py make/Makefile.rules plugins/darwin.py

[Johnny Chen]

Author: johnny
Date: Thu Sep 30 12:11:58 2010
New Revision: 115169

URL: http://llvm.org/viewvc/llvm-project?rev=115169&view=rev
Log:
Stop using LLDB_CC/LLDB_ARCH in the plugins for test configurations.  Use make
friendly CC and ARCH, instead.

Modified:
    lldb/trunk/test/dotest.py
    lldb/trunk/test/make/Makefile.rules
    lldb/trunk/test/plugins/darwin.py

Modified: lldb/trunk/test/dotest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/dotest.py?rev=115169&r1=115168&r2=115169&view=diff
==============================================================================
--- lldb/trunk/test/dotest.py (original)
+++ lldb/trunk/test/dotest.py Thu Sep 30 12:11:58 2010
@@ -386,11 +386,11 @@
 for ia in range(len(archs) if iterArchs else 1):
     archConfig = ""
     if iterArchs:
-        os.environ["LLDB_ARCH"] = archs[ia]
+        os.environ["ARCH"] = archs[ia]
         archConfig = "arch=%s" % archs[ia]
     for ic in range(len(compilers) if iterCompilers else 1):
         if iterCompilers:
-            os.environ["LLDB_CC"] = compilers[ic]
+            os.environ["CC"] = compilers[ic]
             configString = "%s compiler=%s" % (archConfig, compilers[ic])
         else:
             configString = archConfig

Modified: lldb/trunk/test/make/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/make/Makefile.rules?rev=115169&r1=115168&r2=115169&view=diff
==============================================================================
--- lldb/trunk/test/make/Makefile.rules (original)
+++ lldb/trunk/test/make/Makefile.rules Thu Sep 30 12:11:58 2010
@@ -22,7 +22,7 @@
 #----------------------------------------------------------------------
 DS := /usr/bin/dsymutil
 DSFLAGS =
-CC = gcc
+CC ?= gcc
 CFLAGS ?=-arch $(ARCH) -gdwarf-2 -O0
 CXXFLAGS +=$(CFLAGS)
 LD = $(CC)

Modified: lldb/trunk/test/plugins/darwin.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/plugins/darwin.py?rev=115169&r1=115168&r2=115169&view=diff
==============================================================================
--- lldb/trunk/test/plugins/darwin.py (original)
+++ lldb/trunk/test/plugins/darwin.py Thu Sep 30 12:11:58 2010
@@ -23,8 +23,8 @@
     used for the make system.
     """
     arch = architecture if architecture else None
-    if not arch and "LLDB_ARCH" in os.environ:
-        arch = os.environ["LLDB_ARCH"]
+    if not arch and "ARCH" in os.environ:
+        arch = os.environ["ARCH"]
 
     # Note the leading space character.
     return (" ARCH=" + arch) if arch else ""
@@ -35,8 +35,8 @@
     used for the make system.
     """
     cc = compiler if compiler else None
-    if not cc and "LLDB_CC" in os.environ:
-        cc = os.environ["LLDB_CC"]
+    if not cc and "CC" in os.environ:
+        cc = os.environ["CC"]
 
     # Note the leading space character.
     return (" CC=" + cc) if cc else ""