From 057eb1b350fb9759e08610de988b528b649226be Mon Sep 17 00:00:00 2001
From: SirLynix <lynix680@gmail.com>
Date: Wed, 27 Jul 2022 23:02:02 +0200
Subject: [PATCH] Try to fix MinGW ci

---
 .github/workflows/msys2-build.yml |  2 +-
 xmake.lua                         |  4 ----
 xmake/rules/msys2_isystem_fix.lua | 14 --------------
 3 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 xmake/rules/msys2_isystem_fix.lua

diff --git a/.github/workflows/msys2-build.yml b/.github/workflows/msys2-build.yml
index 43fae1a77..2479a1c8c 100644
--- a/.github/workflows/msys2-build.yml
+++ b/.github/workflows/msys2-build.yml
@@ -92,7 +92,7 @@ jobs:
 
     # Setup compilation mode and install project dependencies
     - name: Configure xmake and install dependencies
-      run: xmake config --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --ccache=n --ffmpeg=y --shadernodes=y --tests=y --unitybuild=y --yes --verbose --diagnosis
+      run: xmake config --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --ccache=n --ffmpeg=y --shadernodes=y --tests=y --unitybuild=y --yes --verbose --diagnosis --policies=package.include_external_headers:n
 
     # Build the engine
     - name: Build Nazara
diff --git a/xmake.lua b/xmake.lua
index 02746a8e1..b0bc5d88e 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -205,10 +205,6 @@ if is_plat("windows") then
 elseif is_plat("mingw") then
 	add_cxflags("-Og", "-Wa,-mbig-obj")
 	add_ldflags("-Wa,-mbig-obj")
-
-	if is_subhost("msys", "cygwin") then
-		add_rules("msys2.isystem.fix")
-	end
 end
 
 for name, module in pairs(modules) do
diff --git a/xmake/rules/msys2_isystem_fix.lua b/xmake/rules/msys2_isystem_fix.lua
deleted file mode 100644
index cb07521a3..000000000
--- a/xmake/rules/msys2_isystem_fix.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-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)