diff options
| -rw-r--r-- | lib/Basic/Targets.cpp | 6 | ||||
| -rw-r--r-- | lib/Driver/ToolChains.cpp | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index 236668f32b..84a245a4ef 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -127,13 +127,9 @@ static void getDarwinDefines(MacroBuilder &Builder, const LangOptions &Opts, Min = Maj - 4; Maj = 10; } - } else if (Triple.getOS() == llvm::Triple::OSX) { - Triple.getOSVersion(Maj, Min, Rev); - PlatformName = "macosx"; } else { - assert(Triple.getOS() == llvm::Triple::IOS && "unexpected triple!"); Triple.getOSVersion(Maj, Min, Rev); - PlatformName = "ios"; + PlatformName = Triple.getOSName(); } } diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index d7959bde97..02105ac184 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -151,7 +151,7 @@ std::string Darwin::ComputeEffectiveClangTriple(const ArgList &Args) const { llvm::SmallString<16> Str; llvm::raw_svector_ostream(Str) - << (isTargetIPhoneOS() ? "ios" : "osx") + << (isTargetIPhoneOS() ? "ios" : "macosx") << Version[0] << "." << Version[1] << "." << Version[2]; Triple.setOSName(Str.str()); |