[cfe-commits] r91183 - /cfe/trunk/test/lit.cfg

[Daniel Dunbar]

Author: ddunbar
Date: Fri Dec 11 17:35:10 2009
New Revision: 91183

URL: http://llvm.org/viewvc/llvm-project?rev=91183&view=rev
Log:
Tests: Stop looking for clang-cc, we don't need it.

Modified:
    cfe/trunk/test/lit.cfg

Modified: cfe/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/lit.cfg?rev=91183&r1=91182&r2=91183&view=diff

==============================================================================
--- cfe/trunk/test/lit.cfg (original)
+++ cfe/trunk/test/lit.cfg Fri Dec 11 17:35:10 2009
@@ -119,40 +119,8 @@
 
     return clang
 
-def inferClangCC(clang, PATH):
-    clangcc = os.getenv('CLANGCC')
-
-    # If the user set clang in the environment, definitely use that and don't
-    # try to validate.
-    if clangcc:
-        return clangcc
-
-    # Otherwise try adding -cc since we expect to be looking in a build
-    # directory.
-    if clang.endswith('.exe'):
-        clangccName = clang[:-4] + '-cc.exe'
-    else:
-        clangccName = clang + '-cc'
-    clangcc = lit.util.which(clangccName, PATH)
-    if not clangcc:
-        # Otherwise ask clang.
-        res = lit.util.capture([clang, '-print-prog-name=clang-cc'])
-        res = res.strip()
-        if res and os.path.exists(res):
-            clangcc = res
-
-    if not clangcc:
-        lit.fatal("couldn't find 'clang-cc' program, try setting "
-                  "CLANGCC in your environment")
-
-    return clangcc
-
 config.clang = inferClang(config.environment['PATH'])
 if not lit.quiet:
     lit.note('using clang: %r' % config.clang)
 config.substitutions.append( (' clang ', ' ' + config.clang + ' ') )
-
-config.clang_cc = inferClangCC(config.clang, config.environment['PATH'])
-if not lit.quiet:
-    lit.note('using clang-cc: %r' % config.clang_cc)
 config.substitutions.append( (' clang-cc ', ' ' + config.clang + ' -cc1 ') )