diff options
| author | Joerg Sonnenberger <joerg@bec.de> | 2015-09-23 20:07:56 +0000 |
|---|---|---|
| committer | Joerg Sonnenberger <joerg@bec.de> | 2015-09-23 20:07:56 +0000 |
| commit | 5c3f9d516d04428e8370c485cd2aade57f8cb58a (patch) | |
| tree | 355fee438dd60f18ecaf281aa38c665c50ca7b69 /clang/lib/Driver/Tools.cpp | |
| parent | 209c424d1e79670b24042064454c0214aa6213d4 (diff) | |
| download | llvm-5c3f9d516d04428e8370c485cd2aade57f8cb58a.zip llvm-5c3f9d516d04428e8370c485cd2aade57f8cb58a.tar.gz llvm-5c3f9d516d04428e8370c485cd2aade57f8cb58a.tar.bz2 | |
Push OpenMP linker flags after linker input on Darwin. Don't add any
libraries if -nostdlib is specified. Test.
llvm-svn: 248424
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 949932d..8e8a232 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -6749,8 +6749,6 @@ void darwin::Linker::ConstructJob(Compilation &C, const JobAction &JA, Args.AddAllArgs(CmdArgs, options::OPT_L); - addOpenMPRuntime(CmdArgs, getToolChain(), Args); - AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs); // Build the input file for -filelist (list of linker input files) in case we // need it later @@ -6769,6 +6767,10 @@ void darwin::Linker::ConstructJob(Compilation &C, const JobAction &JA, InputFileList.push_back(II.getFilename()); } + if (!Args.hasArg(options::OPT_nostdlib) && + !Args.hasArg(options::OPT_nodefaultlibs)) + addOpenMPRuntime(CmdArgs, getToolChain(), Args); + if (isObjCRuntimeLinked(Args) && !Args.hasArg(options::OPT_nostdlib) && !Args.hasArg(options::OPT_nodefaultlibs)) { // We use arclite library for both ARC and subscripting support. |