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

[Rémi Bernon]

From: Rémi Bernon

---
 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=""