maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Driver/Darwin: Switch to using -macosx for OS name in triples. 

llvm-svn: 129834
This commit is contained in:
Daniel Dunbar 2011-04-19 23:34:17 +00:00
parent 0854f347d2
commit 308cfd045f
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/Basic/Targets.cpp
View File

@ -127,13 +127,9 @@ static void getDarwinDefines(MacroBuilder &Builder, const LangOptions &Opts,
Min = Maj - 4; Min = Maj - 4;
Maj = 10; Maj = 10;
} }
} else if (Triple.getOS() == llvm::Triple::OSX) {
Triple.getOSVersion(Maj, Min, Rev);
PlatformName = "macosx";
} else { } else {
assert(Triple.getOS() == llvm::Triple::IOS && "unexpected triple!");
Triple.getOSVersion(Maj, Min, Rev); Triple.getOSVersion(Maj, Min, Rev);
PlatformName = "ios"; PlatformName = Triple.getOSName();
} }
} }

2
clang/lib/Driver/ToolChains.cpp
View File

@ -151,7 +151,7 @@ std::string Darwin::ComputeEffectiveClangTriple(const ArgList &Args) const {
llvm::SmallString<16> Str; llvm::SmallString<16> Str;
llvm::raw_svector_ostream(Str) llvm::raw_svector_ostream(Str)
<< (isTargetIPhoneOS() ? "ios" : "osx") << (isTargetIPhoneOS() ? "ios" : "macosx")
<< Version[0] << "." << Version[1] << "." << Version[2]; << Version[0] << "." << Version[1] << "." << Version[2];
Triple.setOSName(Str.str()); Triple.setOSName(Str.str());