ccc: Mark -combine option as unsupported.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@63348 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/ccc/ccclib/Arguments.py b/tools/ccc/ccclib/Arguments.py
index 051498f31052eedea6b4d28210635b74ed64a2e4..bb259137f5945f045c27f40f4fc11fb00211e94f 100644 (file)
--- a/tools/ccc/ccclib/Arguments.py
+++ b/tools/ccc/ccclib/Arguments.py
@@ -520,7 +520,7 @@ class OptionParser:
         self.EOption = self.addOption(FlagOption('-E'))
         self.SOption = self.addOption(FlagOption('-S'))
         self.cOption = self.addOption(FlagOption('-c'))
-        self.combineOption = self.addOption(FlagOption('-combine'))
+        self.combineOption = self.addOption(FlagOption('-combine', unsupported=True))
         self.noIntegratedCPPOption = self.addOption(FlagOption('-no-integrated-cpp'))
         self.pipeOption = self.addOption(FlagOption('-pipe'))
         self.saveTempsOption = self.addOption(FlagOption('-save-temps'))

diff --git a/tools/ccc/ccclib/Driver.py b/tools/ccc/ccclib/Driver.py
index bdcdcb731cfe9a269b96632824dcb56f969f40f5..2f4cc14066adc9cb5ba299fdd84f2a87f3224a16 100644 (file)
--- a/tools/ccc/ccclib/Driver.py
+++ b/tools/ccc/ccclib/Driver.py
@@ -443,10 +443,6 @@ class Driver(object):
         if finalPhaseOpt:
             self.claim(finalPhaseOpt)
 
-        # FIXME: Support -combine.
-        if hasCombine:
-            raise NotImplementedError,"-combine is not yet supported"
-        
         # Reject -Z* at the top level for now.
         arg = args.getLastArg(self.parser.ZOption)
         if arg: