diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2009-08-24 22:26:16 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2009-08-24 22:26:16 +0000 |
| commit | 0e2679d29be70186fc1197a1484948ed239922ba (patch) | |
| tree | 055b4405af4657d308e88f2b7be97a54d9edaab9 /lib/Driver/Tools.cpp | |
| parent | 6d9eae69a07d6ea55bad53eff217ea2f0737e5a0 (diff) | |
PR4766: Don't pass -static to 'as' on x86_64 on Darwin.
Also, do pass -static even with -dynamic on i386.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@79948 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/Tools.cpp')
| -rw-r--r-- | lib/Driver/Tools.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 9c8d9401b0..1fb161ae20 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -1277,10 +1277,10 @@ void darwin::Assemble::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back(Args.MakeArgString(getToolChain().getArchName().c_str())); CmdArgs.push_back("-force_cpusubtype_ALL"); - if ((Args.hasArg(options::OPT_mkernel) || + if (getToolChain().getTriple().getArch() != llvm::Triple::x86_64 && + (Args.hasArg(options::OPT_mkernel) || Args.hasArg(options::OPT_static) || - Args.hasArg(options::OPT_fapple_kext)) && - !Args.hasArg(options::OPT_dynamic)) + Args.hasArg(options::OPT_fapple_kext))) CmdArgs.push_back("-static"); Args.AddAllArgValues(CmdArgs, options::OPT_Wa_COMMA, |