[llvm-branch-commits] [cfe-branch] r120661 - /cfe/branches/Apple/whitney/lib/Driver/Tools.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Wed Dec  1 20:52:02 2010
New Revision: 120661

URL: http://llvm.org/viewvc/llvm-project?rev=120661&view=rev
Log:
Merge r119803:
--
Author: Daniel Dunbar <daniel at zuster.org>
Date:   Fri Nov 19 16:23:35 2010 +0000

    Driver: Ignore -force_cpusubtype_ALL.

Modified:
    cfe/branches/Apple/whitney/lib/Driver/Tools.cpp

Modified: cfe/branches/Apple/whitney/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/lib/Driver/Tools.cpp?rev=120661&r1=120660&r2=120661&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/lib/Driver/Tools.cpp (original)
+++ cfe/branches/Apple/whitney/lib/Driver/Tools.cpp Wed Dec  1 20:52:02 2010
@@ -795,6 +795,9 @@
         }
       }
     }
+
+    // Also ignore explicit -force_cpusubtype_ALL option.
+    (void) Args.hasArg(options::OPT_force__cpusubtype__ALL);
   } else if (isa<PrecompileJobAction>(JA)) {
     // Use PCH if the user requested it.
     bool UsePCH = D.CCCUsePCH;