diff options
author | Daniel Dunbar <daniel@zuster.org> | 2009-09-18 08:15:13 +0000 |
---|---|---|
committer | Daniel Dunbar <daniel@zuster.org> | 2009-09-18 08:15:13 +0000 |
commit | 1d4612b829500cbe04a2eafca74afac703e34934 (patch) | |
tree | e3ab74a0bab68748207828bca6659fbdf661d7e7 /lib/Driver/Tools.cpp | |
parent | 6cd4154b9088fa18ae05d11c0f3140fafd76c734 (diff) |
Split Darwin toolchain into Clang and GCC Darwin toolchains with a common base.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@82213 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/Tools.cpp')
-rw-r--r-- | lib/Driver/Tools.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 66053178e1..9472928f40 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -1588,7 +1588,7 @@ void darwin::Assemble::ConstructJob(Compilation &C, const JobAction &JA, // Derived from asm spec. AddDarwinArch(Args, CmdArgs); - if (!getDarwinToolChain().isIPhone() || + if (!getDarwinToolChain().isIPhoneOS() || Args.hasArg(options::OPT_force__cpusubtype__ALL)) CmdArgs.push_back("-force_cpusubtype_ALL"); @@ -1792,7 +1792,7 @@ void darwin::Link::AddLinkArgs(const ArgList &Args, Args.AddLastArg(CmdArgs, options::OPT_all__load); Args.AddAllArgs(CmdArgs, options::OPT_allowable__client); Args.AddLastArg(CmdArgs, options::OPT_bind__at__load); - if (getDarwinToolChain().isIPhone()) + if (getDarwinToolChain().isIPhoneOS()) Args.AddLastArg(CmdArgs, options::OPT_arch__errors__fatal); Args.AddLastArg(CmdArgs, options::OPT_dead__strip); Args.AddLastArg(CmdArgs, options::OPT_no__dead__strip__inits__and__terms); @@ -1807,7 +1807,7 @@ void darwin::Link::AddLinkArgs(const ArgList &Args, if (!Args.hasArg(options::OPT_mmacosx_version_min_EQ) && !Args.hasArg(options::OPT_miphoneos_version_min_EQ)) { // Add default version min. - if (!getDarwinToolChain().isIPhone()) { + if (!getDarwinToolChain().isIPhoneOS()) { CmdArgs.push_back("-macosx_version_min"); CmdArgs.push_back(getDarwinToolChain().getMacosxVersionStr()); } else { @@ -1849,7 +1849,7 @@ void darwin::Link::AddLinkArgs(const ArgList &Args, Args.AddAllArgs(CmdArgs, options::OPT_sub__umbrella); Args.AddAllArgsTranslated(CmdArgs, options::OPT_isysroot, "-syslibroot"); - if (getDarwinToolChain().isIPhone()) { + if (getDarwinToolChain().isIPhoneOS()) { if (!Args.hasArg(options::OPT_isysroot)) { CmdArgs.push_back("-syslibroot"); CmdArgs.push_back("/Developer/SDKs/Extra"); @@ -1953,7 +1953,7 @@ void darwin::Link::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back("-lcrt0.o"); } else { // Derived from darwin_crt1 spec. - if (getDarwinToolChain().isIPhone()) { + if (getDarwinToolChain().isIPhoneOS()) { CmdArgs.push_back("-lcrt1.o"); } else if (getDarwinToolChain().isMacosxVersionLT(MacosxVersionMin, 10, 5)) |