[cfe-commits] r64419 - /cfe/trunk/tools/ccc/ccclib/Tools.py

[Daniel Dunbar]

Author: ddunbar
Date: Thu Feb 12 18:49:01 2009
New Revision: 64419

URL: http://llvm.org/viewvc/llvm-project?rev=64419&view=rev
Log:
ccc: Stop patching output file name when using transparent PTH support.
<rdar://problem/6515236> [ccc] generate expected output files when used with PCH

Modified:
    cfe/trunk/tools/ccc/ccclib/Tools.py

Modified: cfe/trunk/tools/ccc/ccclib/Tools.py
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/ccc/ccclib/Tools.py?rev=64419&r1=64418&r2=64419&view=diff

==============================================================================
--- cfe/trunk/tools/ccc/ccclib/Tools.py (original)
+++ cfe/trunk/tools/ccc/ccclib/Tools.py Thu Feb 12 18:49:01 2009
@@ -176,8 +176,6 @@
                      output, outputType, arglist, linkingOutput):
         cmd_args = []
 
-        patchOutputNameForPTH = False
-
         if isinstance(phase.phase, Phases.AnalyzePhase):
             assert outputType is Types.PlistType
             cmd_args.append('-analyze')
@@ -194,9 +192,9 @@
               outputType is inputs[0].type.preprocess):
             cmd_args.append('-E')
         elif outputType is Types.PCHType:
-            # No special option needed, driven by -x. However, we
-            # patch the output name to try and not conflict with gcc.
-            patchOutputNameForPTH = True
+            # No special option needed, driven by -x.
+            #
+            # FIXME: Don't drive this by -x, that is gross.
 
             # FIXME: This is a total hack. Copy the input header file
             # to the output, so that it can be -include'd by clang.
@@ -337,15 +335,8 @@
 
         if isinstance(output, Jobs.PipedJob):
             cmd_args.extend(['-o', '-'])
-        else:
-            if patchOutputNameForPTH:
-                base,suffix = os.path.splitext(arglist.getValue(output))
-                if suffix == '.gch':
-                    suffix = '.pth'
-                cmd_args.append('-o')
-                cmd_args.append(base + suffix)
-            elif output:
-                cmd_args.extend(arglist.render(output))
+        elif output:
+            cmd_args.extend(arglist.render(output))
 
         for input in inputs:
             cmd_args.append('-x')