Alexandre Julliard : configure: Don't override the specified TARGETFLAGS.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c08ffc6537727c3f8d0f0ddea803f5406f7b1d8d
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=c08ffc6537727c3f8d0f0ddea...

Author: Alexandre Julliard 
Date:   Wed Mar  3 15:38:44 2021 +0100

configure: Don't override the specified TARGETFLAGS.

Signed-off-by: Alexandre Julliard

---

configure    |  9 ++++-----
 configure.ac | 10 +++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index 2b20133cd65..13eecaf05d7 100755
--- a/configure
+++ b/configure
@@ -5647,7 +5647,6 @@ case $host in
     ;;
 esac

-TARGETFLAGS=""

case $host in
   x86_64*|amd64*)
@@ -5685,7 +5684,7 @@ $as_echo "$wine_cv_cc_m32" >&6; }
       test $wine_cv_cc_m32 != no || as_fn_error $? "Cannot build a 32-bit program, you need to install 32-bit development libraries." "$LINENO" 5
       host_cpu="i386"
       notice_platform="32-bit "
-      TARGETFLAGS="-m32"
+      TARGETFLAGS="$TARGETFLAGS -m32"
       PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig}
       export PKG_CONFIG_PATH
       enable_win16=${enable_win16:-yes}
@@ -5724,7 +5723,7 @@ $as_echo "$wine_cv_builtin_ms_va_list" >&6; }
       CXX="$CXX -m64"
       host_cpu="x86_64"
       notice_platform="64-bit "
-      TARGETFLAGS="-m64"
+      TARGETFLAGS="$TARGETFLAGS -m64"
       enable_wow64cpu=${enable_wow64cpu:-yes}
     fi
     ;;
@@ -5758,10 +5757,10 @@ $as_echo "$wine_cv_thumb2" >&6; }
     if test x"$wine_cv_thumb2" = xyes
     then
         CFLAGS="$CFLAGS -mthumb"
-        TARGETFLAGS="-mthumb"
+        TARGETFLAGS="$TARGETFLAGS -mthumb"
     else
         CFLAGS="$CFLAGS -marm"
-        TARGETFLAGS="-marm"
+        TARGETFLAGS="$TARGETFLAGS -marm"
     fi
     case $with_float_abi in
       soft|softfp|hard)
diff --git a/configure.ac b/configure.ac
index 24f5c8847d6..6a4e9568c40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -140,7 +140,7 @@ case $host in
     ;;
 esac

-AC_SUBST(TARGETFLAGS,"")
+AC_SUBST(TARGETFLAGS)
 case $host in
   x86_64*|amd64*)
     if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes"
@@ -152,7 +152,7 @@ case $host in
       test $wine_cv_cc_m32 != no || AC_MSG_ERROR([Cannot build a 32-bit program, you need to install 32-bit development libraries.])
       host_cpu="i386"
       notice_platform="32-bit "
-      TARGETFLAGS="-m32"
+      TARGETFLAGS="$TARGETFLAGS -m32"
       PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig}
       export PKG_CONFIG_PATH
       enable_win16=${enable_win16:-yes}
@@ -169,7 +169,7 @@ case $host in
       CXX="$CXX -m64"
       host_cpu="x86_64"
       notice_platform="64-bit "
-      TARGETFLAGS="-m64"
+      TARGETFLAGS="$TARGETFLAGS -m64"
       enable_wow64cpu=${enable_wow64cpu:-yes}
     fi
     ;;
@@ -180,10 +180,10 @@ case $host in
     if test x"$wine_cv_thumb2" = xyes
     then
         CFLAGS="$CFLAGS -mthumb"
-        TARGETFLAGS="-mthumb"
+        TARGETFLAGS="$TARGETFLAGS -mthumb"
     else
         CFLAGS="$CFLAGS -marm"
-        TARGETFLAGS="-marm"
+        TARGETFLAGS="$TARGETFLAGS -marm"
     fi
     case $with_float_abi in
       soft|softfp|hard)