aboutsummaryrefslogtreecommitdiff
path: root/lib/Driver/Tools.cpp
diff options
context:
space:
mode:
authorJohn McCall <rjmccall@apple.com>2011-07-06 02:36:30 +0000
committerJohn McCall <rjmccall@apple.com>2011-07-06 02:36:30 +0000
commitf1443bedeb68a461c548f7a552fc0964520f24cb (patch)
treed7a12b5de8db729583ebed9697850ec3ace66087 /lib/Driver/Tools.cpp
parent256a76e0b0e0c9e65a3122917d553ef10bc84d29 (diff)
Somehow the -fgnu-runtime option itself got lost in all that shuffling.
Restore it. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@134459 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/Tools.cpp')
-rw-r--r--lib/Driver/Tools.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index d4d41d28d5..a9f294ffbf 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -1772,10 +1772,12 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
bool NeXTRuntimeIsDefault
= (IsRewriter || getToolChain().getTriple().isOSDarwin());
if (Args.hasFlag(options::OPT_fnext_runtime, options::OPT_fgnu_runtime,
- NeXTRuntimeIsDefault))
+ NeXTRuntimeIsDefault)) {
objCRuntime.setKind(ObjCRuntime::NeXT);
- else
+ } else {
+ CmdArgs.push_back("-fgnu-runtime");
objCRuntime.setKind(ObjCRuntime::GNU);
+ }
getToolChain().configureObjCRuntime(objCRuntime);
if (objCRuntime.HasARC)
CmdArgs.push_back("-fobjc-runtime-has-arc");