diff options
| author | Michael J. Spencer <bigcheesegs@gmail.com> | 2012-06-18 16:56:04 +0000 |
|---|---|---|
| committer | Michael J. Spencer <bigcheesegs@gmail.com> | 2012-06-18 16:56:04 +0000 |
| commit | e2f493604ac078071653a66f58a9101de75ad846 (patch) | |
| tree | dc332072fdb85488ee8ab8207bd289681b3f4595 | |
| parent | e881ce2ef6da7865f30fe968fbb3d758436e0ab2 (diff) | |
| download | bcm5719-llvm-e2f493604ac078071653a66f58a9101de75ad846.tar.gz bcm5719-llvm-e2f493604ac078071653a66f58a9101de75ad846.zip | |
[VS Toolchain] Correctly forward -l linker inputs to link.exe.
Patch by Nikola Smiljanic!
llvm-svn: 158664
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 9 | ||||
| -rw-r--r-- | clang/test/Driver/msvc_forward.c | 5 |
2 files changed, 13 insertions, 1 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 150815096f6..f354c13a746 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -5739,7 +5739,14 @@ void visualstudio::Link::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back("-nologo"); - AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs); + Args.AddAllArgValues(CmdArgs, options::OPT_l); + + // Add filenames immediately. + for (InputInfoList::const_iterator + it = Inputs.begin(), ie = Inputs.end(); it != ie; ++it) { + if (it->isFilename()) + CmdArgs.push_back(it->getFilename()); + } const char *Exec = Args.MakeArgString(getToolChain().GetProgramPath("link.exe")); diff --git a/clang/test/Driver/msvc_forward.c b/clang/test/Driver/msvc_forward.c new file mode 100644 index 00000000000..fe0ae84790e --- /dev/null +++ b/clang/test/Driver/msvc_forward.c @@ -0,0 +1,5 @@ +// RUN: %clang -target i686-pc-win32 -lkernel32.lib -luser32.lib -### %s 2>&1 | FileCheck %s +// CHECK-NOT: "-lkernel32.lib" +// CHECK-NOT: "-luser32.lib" +// CHECK: "kernel32.lib" +// CHECK: "user32.lib" |
