Fix assembler invocation with older Xcode

Xcode prior to 7 uses GNU as, not the Apple clang-based driver which
supports the -target option.

Now: Clang as uses -target, GNU as uses -arch, no other options.

Change-Id: I389a43cf7118f3b6330a2aea16d47d7f21dbb2e6
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

1 files changed, 27 insertions, 0 deletions

diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js
index fbcca23b0..3d3e69827 100644
--- a/share/qbs/modules/cpp/gcc.js
+++ b/share/qbs/modules/cpp/gcc.js
@@ -1143,3 +1143,30 @@ function dumpDefaultPaths(env, compilerFilePath, args, nullDevice, pathListSepar
         p.close();
     }
 }
+
+function targetFlags(tool, hasTargetOption, target, targetArch, machineType) {
+    var args = [];
+    if (hasTargetOption) {
+        if (target)
+            args.push("-target", target);
+    } else {
+        var archArgs = {
+            "compiler": {
+                "i386": ["-m32"],
+                "x86_64": ["-m64"],
+            },
+            "assembler": {
+                "i386": ["--32"],
+                "x86_64": ["--64"],
+            },
+        };
+
+        var flags = archArgs[tool] ? archArgs[tool][targetArch] : undefined;
+        if (flags)
+            args = args.concat(flags);
+
+        if (machineType && tool !== "linker")
+            args.push("-march=" + machineType);
+    }
+    return args;
+}