summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2022-03-25 22:48:34 +0800
committerruki <[email protected]>2022-03-25 22:48:34 +0800
commit90dfe36c7560d7d8afbeeaa795932ed8f618f991 (patch)
tree09f4a1610e11352e36b1498b415391ba8b872f62
parentb2706a335ba5476eed747bfd62e5da13dbd9f172 (diff)
fix load iphoneos
-rw-r--r--xmake/modules/package/tools/cmake.lua2
-rw-r--r--xmake/toolchains/xcode/load_appletvos.lua3
-rw-r--r--xmake/toolchains/xcode/load_iphoneos.lua3
-rw-r--r--xmake/toolchains/xcode/load_watchos.lua3
4 files changed, 10 insertions, 1 deletions
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua
index 95134319e..f77fb0d48 100644
--- a/xmake/modules/package/tools/cmake.lua
+++ b/xmake/modules/package/tools/cmake.lua
@@ -589,7 +589,7 @@ function _build_for_make(package, configs, opt)
local argv = {}
if opt.target then
table.insert(argv, opt.target)
- end
+ end
local jobs = _get_parallel_njobs(opt)
table.insert(argv, "-j" .. jobs)
if option.get("verbose") then
diff --git a/xmake/toolchains/xcode/load_appletvos.lua b/xmake/toolchains/xcode/load_appletvos.lua
index e9f8ef567..c251e85b1 100644
--- a/xmake/toolchains/xcode/load_appletvos.lua
+++ b/xmake/toolchains/xcode/load_appletvos.lua
@@ -29,6 +29,9 @@ function main(toolchain)
local xcode_sdkver = toolchain:config("xcode_sdkver")
local xcode_sysroot = toolchain:config("xcode_sysroot")
+ -- is simulator?
+ local simulator = toolchain:is_arch("x86_64", "i386")
+
-- init target minimal version
local target_minver = toolchain:config("target_minver")
local target_minver_flags = (simulator and "-mappletv-simulator-version-min=" or "-mappletvos-version-min=") .. target_minver
diff --git a/xmake/toolchains/xcode/load_iphoneos.lua b/xmake/toolchains/xcode/load_iphoneos.lua
index 0fda9704c..c437ce975 100644
--- a/xmake/toolchains/xcode/load_iphoneos.lua
+++ b/xmake/toolchains/xcode/load_iphoneos.lua
@@ -29,6 +29,9 @@ function main(toolchain)
local xcode_sdkver = toolchain:config("xcode_sdkver")
local xcode_sysroot = toolchain:config("xcode_sysroot")
+ -- is simulator?
+ local simulator = toolchain:is_arch("x86_64", "i386")
+
-- init target minimal version
local target_minver = toolchain:config("target_minver")
if target_minver and tonumber(target_minver) > 10 and (arch == "armv7" or arch == "armv7s" or arch == "i386") then
diff --git a/xmake/toolchains/xcode/load_watchos.lua b/xmake/toolchains/xcode/load_watchos.lua
index b5a47b259..b0929ed5e 100644
--- a/xmake/toolchains/xcode/load_watchos.lua
+++ b/xmake/toolchains/xcode/load_watchos.lua
@@ -29,6 +29,9 @@ function main(toolchain)
local xcode_sdkver = toolchain:config("xcode_sdkver")
local xcode_sysroot = toolchain:config("xcode_sysroot")
+ -- is simulator?
+ local simulator = toolchain:is_arch("x86_64", "i386")
+
-- init target minimal version
local target_minver = toolchain:config("target_minver")
local target_minver_flags = (simulator and "-mwatchos-simulator-version-min=" or "-mwatchos-version-min=") .. target_minver