diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2021-05-05 14:53:00 +0200 |
---|---|---|
committer | Ivan Komissarov <abbapoh@gmail.com> | 2021-05-05 14:53:00 +0200 |
commit | b69f1a4fbfbf6fed4ffc42d6191082b6a20af828 (patch) | |
tree | 4ed0c8c083d376261a9a0c5f3c8908b9de679ca8 /share/qbs/modules/bundle/BundleModule.qbs | |
parent | 1c3e61227d7e474bd56cc38fdc259f3cc5d3a661 (diff) | |
parent | 86eb6974126b4fdf4cfa3340b7a80833479f2d37 (diff) |
Merge branch '1.19' into master
Change-Id: Id2691bd6a49ca6c2886cf5f460351e3d1daad9e6
Diffstat (limited to 'share/qbs/modules/bundle/BundleModule.qbs')
-rw-r--r-- | share/qbs/modules/bundle/BundleModule.qbs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/share/qbs/modules/bundle/BundleModule.qbs b/share/qbs/modules/bundle/BundleModule.qbs index 63f12db07..2568f3435 100644 --- a/share/qbs/modules/bundle/BundleModule.qbs +++ b/share/qbs/modules/bundle/BundleModule.qbs @@ -71,6 +71,9 @@ Module { "PRODUCT_NAME": product.targetName, "LOCAL_APPS_DIR": Environment.getEnv("HOME") + "/Applications", "LOCAL_LIBRARY_DIR": Environment.getEnv("HOME") + "/Library", + // actually, this is cpp.targetAbi, but XCode does not set it for non-simulator builds + // while Qbs set it to "macho". + "LLVM_TARGET_TRIPLE_SUFFIX": qbs.targetOS.contains("simulator") ? "-simulator" : "", "SWIFT_PLATFORM_TARGET_PREFIX": isMacOs ? "macos" : qbs.targetOS.contains("ios") ? "ios" : "", "TARGET_BUILD_DIR": product.buildDirectory, @@ -83,14 +86,14 @@ Module { property var productTypeIdentifierChain: [] configure: { - var specsPath = path; + var specsPaths = [path]; var specsSeparator = "-"; if (xcodeDeveloperPath && useXcodeBuildSpecs) { - specsPath = Bundle.macOSSpecsPath(xcodeVersion, xcodeDeveloperPath); + specsPaths = Bundle.macOSSpecsPaths(xcodeVersion, xcodeDeveloperPath); specsSeparator = " "; } - var reader = new Bundle.XcodeBuildSpecsReader(specsPath, + var reader = new Bundle.XcodeBuildSpecsReader(specsPaths, specsSeparator, additionalSettings, !isMacOs); |