diff options
| -rw-r--r-- | lib/Driver/Tools.cpp | 9 | ||||
| -rw-r--r-- | test/Driver/msvc_forward.c | 5 |
2 files changed, 13 insertions, 1 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 150815096f..f354c13a74 100644 --- a/lib/Driver/Tools.cpp +++ b/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/test/Driver/msvc_forward.c b/test/Driver/msvc_forward.c new file mode 100644 index 0000000000..fe0ae84790 --- /dev/null +++ b/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" |