[cfe-commits] r137075 - /cfe/trunk/lib/Driver/ToolChains.cpp

Chad Rosier mcrosier at apple.com
Mon Aug 8 16:39:34 PDT 2011


Author: mcrosier
Date: Mon Aug  8 18:39:34 2011
New Revision: 137075

URL: http://llvm.org/viewvc/llvm-project?rev=137075&view=rev
Log:
If no -miphoneos-version-min specified, see if we can set the default based on
-isysroot.
rdar://9837120

Modified:
    cfe/trunk/lib/Driver/ToolChains.cpp

Modified: cfe/trunk/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=137075&r1=137074&r2=137075&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains.cpp Mon Aug  8 18:39:34 2011
@@ -490,6 +490,21 @@
   Arg *iOSSimVersion = Args.getLastArg(
     options::OPT_mios_simulator_version_min_EQ);
 
+  // If no '-miphoneos-version-min' specified, see if we can set the default
+  // based on isysroot.
+  if (!iOSVersion) {
+    if (const Arg *A = Args.getLastArg(options::OPT_isysroot)) {
+      StringRef first, second;
+      StringRef isysroot = A->getValue(Args);
+      llvm::tie(first, second) = isysroot.split(StringRef("SDKs/iPhoneOS"));
+      if (second != "") {
+        const Option *O = Opts.getOption(options::OPT_miphoneos_version_min_EQ);
+        iOSVersion = Args.MakeJoinedArg(0, O, second.substr(0,3));
+        Args.append(iOSVersion);
+      }
+    }
+  }
+
   // FIXME: HACK! When compiling for the simulator we don't get a
   // '-miphoneos-version-min' to help us know whether there is an ARC runtime
   // or not; try to parse a __IPHONE_OS_VERSION_MIN_REQUIRED





More information about the cfe-commits mailing list