diff options
| author | John McCall <rjmccall@apple.com> | 2011-07-06 02:36:30 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2011-07-06 02:36:30 +0000 |
| commit | f1443bedeb68a461c548f7a552fc0964520f24cb (patch) | |
| tree | d7a12b5de8db729583ebed9697850ec3ace66087 | |
| parent | 256a76e0b0e0c9e65a3122917d553ef10bc84d29 (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
| -rw-r--r-- | lib/Driver/Tools.cpp | 6 | ||||
| -rw-r--r-- | test/Driver/gnu-runtime.m | 5 |
2 files changed, 9 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"); diff --git a/test/Driver/gnu-runtime.m b/test/Driver/gnu-runtime.m new file mode 100644 index 0000000000..5a3654c8c4 --- /dev/null +++ b/test/Driver/gnu-runtime.m @@ -0,0 +1,5 @@ +// RUN: %clang -ccc-host-triple i386-apple-darwin10 -### -fsyntax-only -fgnu-runtime %s 2>&1 | FileCheck %s +// RUN: %clang -ccc-host-triple i386-apple-darwin10 -### -x objective-c++ -fsyntax-only -fgnu-runtime %s 2>&1 | FileCheck %s +// CHECK: -fgnu-runtime +// CHECK: -fobjc-runtime-has-arc +// CHECK: -fobjc-runtime-has-weak |