[PATCH v2 0/1] MR7139: configure: Use per-architecture cross flags if they are provided.

[Rémi Bernon]

If `<arch>_CFLAGS`/`<arch>_LDFLAGS` are passed to configure they are ignored and replaced with the default flags. This prefers the user-provided flags if any, and falls back to `CROSSCFLAGS` / `CROSSLDLAGS` then to the default flags.

--
  v2: configure: Use per-architecture cross flags if they are provided.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7139

[PATCH v2 1/1] configure: Use per-architecture cross flags if they are provided.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 configure.ac | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6596f653fb1..cbfed616978 100644
--- a/configure.ac
+++ b/configure.ac
@@ -829,12 +829,16 @@ do
             ;;
         esac])
 
-    CFLAGS=${CROSSCFLAGS:-"-g -O2"}
     CPPFLAGS=""
-    LDFLAGS=$CROSSLDFLAGS
     AS_VAR_COPY([CC],[${wine_arch}_CC])
-    AS_VAR_COPY([${wine_arch}_CFLAGS],[CFLAGS])
-    AS_VAR_COPY([${wine_arch}_LDFLAGS],[LDFLAGS])
+    AS_VAR_IF([${wine_arch}_CFLAGS],[],
+      [CFLAGS=${CROSSCFLAGS:-"-g -O2"}
+       AS_VAR_COPY([${wine_arch}_CFLAGS],[CFLAGS])])
+    AS_VAR_COPY([CFLAGS],[${wine_arch}_CFLAGS])
+    AS_VAR_IF([${wine_arch}_LDFLAGS],[],
+      [LDFLAGS=$CROSSLDFLAGS
+       AS_VAR_COPY([${wine_arch}_LDFLAGS],[LDFLAGS])])
+    AS_VAR_COPY([LDFLAGS],[${wine_arch}_LDFLAGS])
     AS_VAR_SET([${wine_arch}_EXTRACFLAGS],["-D__WINE_PE_BUILD -Wall"])
 
     target=""
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/7139