Build plugins as MH_BUNDLEs on macOS

This is the native object format intended to be used for runtime
loadable executable content (also known as "plugins"). Unlike most Unix
systems, macOS's Mach-O executable format does differentiate between
shared libraries (MH_DYLIB) and loadable modules (MH_BUNDLE).

For the most part, the only noticeable difference is that attempting to
link to an MH_BUNDLE will produce a hard error, which is in any case,
helpful.

Change-Id: I0d3ff284b3fe8f1b10700f1e48bc84dd5c4715b2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 9 insertions, 5 deletions

diff --git a/src/plugins/qbsplugin.qbs b/src/plugins/qbsplugin.qbs
index 3a086966b..bc0ba3b81 100644
--- a/src/plugins/qbsplugin.qbs
+++ b/src/plugins/qbsplugin.qbs
@@ -2,12 +2,15 @@ import qbs
 import qbs.FileInfo
 
 QbsProduct {
+    property bool isForDarwin: qbs.targetOS.contains("darwin")
     Depends { name: "cpp" }
-    Depends { name: "bundle"; condition: qbs.targetOS.contains("darwin") }
+    Depends { name: "bundle"; condition: isForDarwin }
     Depends { name: "Qt.core" }
     Depends { name: "qbsbuildconfig" }
     Depends { name: "qbscore"; condition: !Qt.core.staticBuild }
-    type: (Qt.core.staticBuild ? ["staticlibrary"] : ["dynamiclibrary"]).concat(["qbsplugin"])
+    type: (Qt.core.staticBuild ? ["staticlibrary"]
+                               : [isForDarwin ? "loadablemodule" : "dynamiclibrary"])
+        .concat(["qbsplugin"])
     Properties {
         condition: Qt.core.staticBuild
         cpp.defines: ["QBS_STATIC_LIB"]
@@ -18,14 +21,15 @@ QbsProduct {
     destinationDirectory: FileInfo.joinPaths(project.buildDirectory,
                                              qbsbuildconfig.libDirName + "/qbs/plugins")
     Group {
-        fileTagsFilter: ["dynamiclibrary"]
-            .concat(qbs.buildVariant === "debug" ? ["debuginfo_dll"] : [])
+        fileTagsFilter: [isForDarwin ? "loadablemodule" : "dynamiclibrary"]
+            .concat(qbs.buildVariant === "debug"
+        ? [isForDarwin ? "debuginfo_loadablemodule" : "debuginfo_dll"] : [])
         qbs.install: true
         qbs.installDir: qbsbuildconfig.pluginsInstallDir + "/qbs/plugins"
         qbs.installSourceBase: destinationDirectory
     }
     Properties {
-        condition: qbs.targetOS.contains("darwin")
+        condition: isForDarwin
         bundle.isBundle: false
     }
 }