ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Don't override the specified TARGETFLAGS. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2021-03-03 15:38:44 +01:00
parent 46fd718ec7
commit c08ffc6537
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@ -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)

10
configure.ac
View File

@ -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)