diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2009-04-07 21:42:00 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2009-04-07 21:42:00 +0000 |
| commit | 2ac9fc2ad64e16127df8c60caeea2edfe9a400a2 (patch) | |
| tree | ecdd412d7cca95198a75bb114b068b9541a0a317 /lib/Driver/Tools.cpp | |
| parent | c8bafd7242763b7029a7bed898690ea44a59ae4a (diff) | |
Driver: Only forward last instance of -mmacosx-version-min= and
-isysroot to clang.
- Don't forward arbitrary -i* options to clang, just the ones we know
about.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@68553 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/Tools.cpp')
| -rw-r--r-- | lib/Driver/Tools.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index dd3a00ecb3..9e128984bf 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -287,7 +287,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, Args.AddAllArgs(CmdArgs, options::OPT_D, options::OPT_U); Args.AddAllArgs(CmdArgs, options::OPT_I_Group, options::OPT_F); Args.AddLastArg(CmdArgs, options::OPT_P); - Args.AddAllArgs(CmdArgs, options::OPT_mmacosx_version_min_EQ); + Args.AddLastArg(CmdArgs, options::OPT_mmacosx_version_min_EQ); // Special case debug options to only pass -g to clang. This is // wrong. @@ -296,7 +296,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, Args.AddLastArg(CmdArgs, options::OPT_nostdinc); - // FIXME: Clang isn't going to accept just anything here. + Args.AddLastArg(CmdArgs, options::OPT_isysroot); + // FIXME: Use iterator. // Add -i* options, and automatically translate to -include-pth for @@ -306,7 +307,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, for (ArgList::const_iterator it = Args.begin(), ie = Args.end(); it != ie; ++it) { const Arg *A = *it; - if (!A->getOption().matches(options::OPT_i_Group)) + if (!A->getOption().matches(options::OPT_clang_i_Group)) continue; if (A->getOption().matches(options::OPT_include)) { |