From: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue, 7 Mar 2023 16:24:46 +0000 (+0100)
Subject: ci: Split up -Werror workarounds for debian-mingw32-x86_64 job
X-Git-Tag: upstream/23.3.3~11472
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=66e34fe914e3dd5791166c55578219cf48793cb5;p=platform%2Fupstream%2Fmesa.git

ci: Split up -Werror workarounds for debian-mingw32-x86_64 job

Most of them are only needed for C++ code, one of them only for C.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21781>
---

diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index 930283f..5af7d53 100644
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -661,12 +661,13 @@ debian-ppc64el:
     UNWIND: "disabled"
     C_ARGS: >
       -Wno-error=format
+      -Wno-error=unused-but-set-variable
+    CPP_ARGS: >
+      -Wno-error=format
       -Wno-error=unused-function
       -Wno-error=unused-variable
-      -Wno-error=unused-but-set-variable
       -Wno-error=sign-compare
       -Wno-error=narrowing
-    CPP_ARGS: $C_ARGS
     GALLIUM_DRIVERS: "swrast,d3d12,zink"
     VULKAN_DRIVERS: "swrast,amd,microsoft-experimental"
     GALLIUM_ST: >