msvc: fix asm flags

Filename should be the last argument.

Fixes: QBS-1774
Change-Id: I6a45df6deacdba44bbb28d54ec8a90c2ade4525d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

6 files changed, 23 insertions, 3 deletions

diff --git a/share/qbs/modules/cpp/windows-msvc-base.qbs b/share/qbs/modules/cpp/windows-msvc-base.qbs
index 1a2c338db..9613800e5 100644
--- a/share/qbs/modules/cpp/windows-msvc-base.qbs
+++ b/share/qbs/modules/cpp/windows-msvc-base.qbs
@@ -320,12 +320,11 @@ CppModule {
         outputFileTags: Cpp.assemblerOutputTags(false)
         outputArtifacts: Cpp.assemblerOutputArtifacts(input)
         prepare: {
-            var args = ["/nologo", "/c",
-                        "/Fo" + FileInfo.toWindowsSeparators(output.filePath),
-                        FileInfo.toWindowsSeparators(input.filePath)];
+            var args = ["/nologo", "/c", "/Fo" + FileInfo.toWindowsSeparators(output.filePath)];
             if (product.cpp.debugInformation)
                 args.push("/Zi");
             args = args.concat(Cpp.collectMiscAssemblerArguments(input, "asm"));
+            args.push(FileInfo.toWindowsSeparators(input.filePath));
             var cmd = new Command(product.cpp.assemblerPath, args);
             cmd.description = "assembling " + input.fileName;
             cmd.jobPool = "assembler";
diff --git a/tests/auto/blackbox/testdata/msvc-asm-flags/include/header.inc b/tests/auto/blackbox/testdata/msvc-asm-flags/include/header.inc
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/tests/auto/blackbox/testdata/msvc-asm-flags/include/header.inc
diff --git a/tests/auto/blackbox/testdata/msvc-asm-flags/msvc-asm-flags.asm b/tests/auto/blackbox/testdata/msvc-asm-flags/msvc-asm-flags.asm
new file mode 100644
index 000000000..eddc49131
--- /dev/null
+++ b/tests/auto/blackbox/testdata/msvc-asm-flags/msvc-asm-flags.asm
@@ -0,0 +1,8 @@
+include header.inc
+
+.code
+main proc
+	mov ecx, 16
+main endp
+
+end
\ No newline at end of file
diff --git a/tests/auto/blackbox/testdata/msvc-asm-flags/msvc-asm-flags.qbs b/tests/auto/blackbox/testdata/msvc-asm-flags/msvc-asm-flags.qbs
new file mode 100644
index 000000000..d632098c9
--- /dev/null
+++ b/tests/auto/blackbox/testdata/msvc-asm-flags/msvc-asm-flags.qbs
@@ -0,0 +1,6 @@
+StaticLibrary {
+    condition: qbs.toolchain.includes("msvc")
+    Depends  {  name: "cpp" }
+    files: "msvc-asm-flags.asm"
+    cpp.assemblerFlags: ["/I", "include"]
+}
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 1b4341f12..e6a72cd77 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -8221,6 +8221,12 @@ void TestBlackbox::movedFileDependency()
     QVERIFY2(!m_qbsStdout.contains("compiling main.cpp"), m_qbsStdout.constData());
 }
 
+void TestBlackbox::msvcAsmLinkerFlags()
+{
+    QDir::setCurrent(testDataDir + "/msvc-asm-flags");
+    QCOMPARE(runQbs(), 0);
+}
+
 void TestBlackbox::badInterpreter()
 {
     if (!HostOsInfo::isAnyUnixHost())
diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h
index c662395e3..5d7d33526 100644
--- a/tests/auto/blackbox/tst_blackbox.h
+++ b/tests/auto/blackbox/tst_blackbox.h
@@ -207,6 +207,7 @@ private slots:
     void missingOverridePrefix();
     void moduleConditions();
     void movedFileDependency();
+    void msvcAsmLinkerFlags();
     void multipleChanges();
     void multipleConfigurations();
     void multiplexedTool();