summaryrefslogtreecommitdiff
path: root/xmake/modules/package/tools/xmake.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2023-09-14 00:53:15 +0800
committerruki <[email protected]>2023-09-14 00:53:15 +0800
commitf3e610b80f997057f1539a31b7f2e16f7b0df97c (patch)
tree40d2922e4e8eb9fb1cdba2425437012dd841d474 /xmake/modules/package/tools/xmake.lua
parentb32a99a626e374337a30388aa7abdba8a4f2d593 (diff)
pass appldev to tools.xmake
Diffstat (limited to 'xmake/modules/package/tools/xmake.lua')
-rw-r--r--xmake/modules/package/tools/xmake.lua17
1 files changed, 14 insertions, 3 deletions
diff --git a/xmake/modules/package/tools/xmake.lua b/xmake/modules/package/tools/xmake.lua
index 338c3e761..6e40e40be 100644
--- a/xmake/modules/package/tools/xmake.lua
+++ b/xmake/modules/package/tools/xmake.lua
@@ -93,14 +93,22 @@ end
-- get configs for appleos
function _get_configs_for_appleos(package, configs, opt)
- local appledev = package:config("appledev")
- if appledev then
- table.insert(configs, "--appledev=" .. appledev)
+ local xcode = get_config("xcode")
+ if xcode then
+ table.insert(configs, "--xcode=" .. xcode)
+ end
+ local xcode_sdkver = get_config("xcode_sdkver")
+ if xcode_sdkver then
+ table.insert(configs, "--xcode_sdkver=" .. xcode_sdkver)
end
local target_minver = get_config("target_minver")
if target_minver then
table.insert(configs, "--target_minver=" .. target_minver)
end
+ local appledev = get_config("appledev")
+ if appledev then
+ table.insert(configs, "--appledev=" .. appledev)
+ end
_get_configs_for_qt(package, configs, opt)
_get_configs_for_vcpkg(package, configs, opt)
end
@@ -134,6 +142,9 @@ end
-- get configs for generic, e.g. linux, macosx, bsd host platforms
function _get_configs_for_generic(package, configs, opt)
local names = {"ld", "sh", "ar", "cc", "cxx", "mm", "mxx"}
+ if package:is_plat("macosx") then
+ table.join2(names, "xcode", "xcode_sdkver", "target_minver", "appledev")
+ end
for _, name in ipairs(names) do
local value = get_config(name)
if value ~= nil then