replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify. 

llvm-svn: 94503
This commit is contained in:
Daniel Dunbar 2010-01-26 03:56:40 +00:00
parent a8d7385d99
commit 19afd61201
2 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang/lib/Driver/ToolChains.h
View File

@ -67,8 +67,6 @@ class VISIBILITY_HIDDEN Darwin : public ToolChain {
/// The default iphoneos-version-min of this tool chain.
std::string IPhoneOSVersionMin;
const char *getMacosxVersionMin() const;
public:
Darwin(const HostInfo &Host, const llvm::Triple& Triple,
const unsigned (&DarwinVersion)[3], bool IsIPhoneOS);
@ -112,14 +110,6 @@ public:
return isMacosxVersionLT(A, B);
}
const char *getMacosxVersionStr() const {
return MacosxVersionMin.c_str();
}
const char *getIPhoneOSVersionStr() const {
return IPhoneOSVersionMin.c_str();
}
/// AddLinkSearchPathArgs - Add the linker search paths to \arg CmdArgs.
///
/// \param Args - The input argument list.

19
clang/lib/Driver/Tools.cpp
View File

@ -1948,20 +1948,11 @@ void darwin::Link::AddLinkArgs(const ArgList &Args,
Args.AddAllArgs(CmdArgs, options::OPT_image__base);
Args.AddAllArgs(CmdArgs, options::OPT_init);
if (!Args.hasArg(options::OPT_mmacosx_version_min_EQ) &&
!Args.hasArg(options::OPT_miphoneos_version_min_EQ)) {
// Add default version min.
if (!getDarwinToolChain().isIPhoneOS()) {
CmdArgs.push_back("-macosx_version_min");
CmdArgs.push_back(getDarwinToolChain().getMacosxVersionStr());
} else {
CmdArgs.push_back("-iphoneos_version_min");
CmdArgs.push_back(getDarwinToolChain().getIPhoneOSVersionStr());
}
}
// Adding all arguments doesn't make sense here but this is what
// gcc does.
// Adding all arguments doesn't make sense here but this is what gcc does. One
// of this should always be present thanks to argument translation.
assert((Args.hasArg(options::OPT_mmacosx_version_min_EQ) ||
Args.hasArg(options::OPT_miphoneos_version_min_EQ)) &&
"Missing version argument (lost in translation)?");
Args.AddAllArgsTranslated(CmdArgs, options::OPT_mmacosx_version_min_EQ,
"-macosx_version_min");
Args.AddAllArgsTranslated(CmdArgs, options::OPT_miphoneos_version_min_EQ,