sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix xmake for msys2

This commit is contained in:
Lynix 2022-07-19 20:03:33 +02:00
parent bff356f7df
commit 103421e89a
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xmake.lua
View File

@ -210,10 +210,7 @@ elseif is_plat("mingw") then
add_ldflags("-Wa,-mbig-obj") add_ldflags("-Wa,-mbig-obj")
if is_subhost("msys", "cygwin") then if is_subhost("msys", "cygwin") then
-- disable -isystem for packages as it's broken on msys2 (see https://github.com/msys2/MINGW-packages/issues/10761) add_rules("msys2.isystem.fix")
if project.policy("package.include_external_headers") == nil then
set_policy("package.include_external_headers", false)
end
end end
end end

14
xmake/rules/msys2_isystem_fix.lua Normal file
View File

@ -0,0 +1,14 @@
rule("msys2.isystem.fix")
on_load(function (target)
import("core.project.project")
local external = project.policy("package.include_external_headers")
if external == nil then
external = target:policy("package.include_external_headers")
end
-- disable -isystem for packages as it seems broken on msys2 (see https://github.com/msys2/MINGW-packages/issues/10761)
if external == nil then
target:set("policy", "package.include_external_headers", false)
end
end)