Now the proper fix for r156497. Sorry for the churn.
llvm-svn: 156498
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index 2e2ec93..12f292d 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -59,6 +59,11 @@
DarwinVersion[0] = Minor + 4;
DarwinVersion[1] = Micro;
DarwinVersion[2] = 0;
+
+ // Compute the initial iOS version from the triple
+ getTriple().getiOSVersion(Major, Minor, Micro);
+ llvm::raw_string_ostream(iOSVersionMin)
+ << Major << '.' << Minor << '.' << Micro;
}
types::ID Darwin::LookupTypeForExtension(const char *Ext) const {
@@ -525,10 +530,6 @@
// go ahead as assume we're targeting iOS.
if (OSXTarget.empty() && iOSTarget.empty())
if (getDarwinArchName(Args) == "armv7") {
- unsigned Major, Minor, Micro;
- getTriple().getiOSVersion(Major, Minor, Micro);
- llvm::raw_string_ostream(iOSVersionMin)
- << Major << '.' << Minor << '.' << Micro;
iOSTarget = iOSVersionMin;
}