diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2009-03-31 17:35:15 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2009-03-31 17:35:15 +0000 |
| commit | d640be24fd92c0814f7a83e597adf0b8b00e4566 (patch) | |
| tree | edea4e6586f298a10ba45fc027efa896bcf8405d /clang/lib/Driver/Tools.cpp | |
| parent | fb1a6eb69badf13177004a6226d82282588d3326 (diff) | |
| download | bcm5719-llvm-d640be24fd92c0814f7a83e597adf0b8b00e4566.tar.gz bcm5719-llvm-d640be24fd92c0814f7a83e597adf0b8b00e4566.zip | |
(LLVM up) Update to use llvm::sys::getHostTriple().
- Always pass -triple to clang-cc (-arch will be removed).
- clang-cc doesn't play guess work with the target triple anymore.
llvm-svn: 68119
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index e315a2f20ec..cae07668737 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -39,6 +39,11 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, const char *LinkingOutput) const { ArgStringList CmdArgs; + CmdArgs.push_back("-triple"); + const char *TripleStr = + Args.MakeArgString(getToolChain().getTripleString().c_str()); + CmdArgs.push_back(TripleStr); + if (isa<AnalyzeJobAction>(JA)) { assert(JA.getType() == types::TY_Plist && "Invalid output type."); CmdArgs.push_back("-analyze"); @@ -371,11 +376,6 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, Args.AddAllArgValues(CmdArgs, options::OPT_Xclang); - // FIXME: Always pass the full triple once we aren't concerned with - // ccc compat. - CmdArgs.push_back("-arch"); - CmdArgs.push_back(getToolChain().getArchName().c_str()); - if (Output.getType() == types::TY_Dependencies) { // Handled with other dependency code. } else if (Output.isPipe()) { |
