configure: Remove no longer needed check for -fshort-wchar.
This commit is contained in:
parent
3472939255
commit
f35ddbaf68
|
@ -17224,74 +17224,7 @@ $as_echo "$ac_cv_c_gcc_strength_bug" >&6; }
|
|||
EXTRACFLAGS="$EXTRACFLAGS -fno-strength-reduce"
|
||||
fi
|
||||
|
||||
|
||||
{ $as_echo "$as_me:$LINENO: checking whether the compiler supports -fshort-wchar" >&5
|
||||
$as_echo_n "checking whether the compiler supports -fshort-wchar... " >&6; }
|
||||
if test "${ac_cv_cflags__fshort_wchar+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_wine_try_cflags_saved=$CFLAGS
|
||||
CFLAGS="$CFLAGS -fshort-wchar"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (ac_try="$ac_link"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||||
$as_echo "$ac_try_echo") >&5
|
||||
(eval "$ac_link") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest$ac_exeext && {
|
||||
test "$cross_compiling" = yes ||
|
||||
$as_test_x conftest$ac_exeext
|
||||
}; then
|
||||
ac_cv_cflags__fshort_wchar=yes
|
||||
else
|
||||
$as_echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_cflags__fshort_wchar=no
|
||||
fi
|
||||
|
||||
rm -rf conftest.dSYM
|
||||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
CFLAGS=$ac_wine_try_cflags_saved
|
||||
fi
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags__fshort_wchar" >&5
|
||||
$as_echo "$ac_cv_cflags__fshort_wchar" >&6; }
|
||||
if test $ac_cv_cflags__fshort_wchar = yes; then
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define CC_FLAG_SHORT_WCHAR "-fshort-wchar"
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:$LINENO: checking whether the compiler supports -fno-builtin" >&5
|
||||
{ $as_echo "$as_me:$LINENO: checking whether the compiler supports -fno-builtin" >&5
|
||||
$as_echo_n "checking whether the compiler supports -fno-builtin... " >&6; }
|
||||
if test "${ac_cv_cflags__fno_builtin+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
|
|
|
@ -1312,10 +1312,6 @@ then
|
|||
fi
|
||||
|
||||
dnl Check for some compiler flags
|
||||
|
||||
WINE_TRY_CFLAGS([-fshort-wchar],
|
||||
[AC_DEFINE(CC_FLAG_SHORT_WCHAR, "-fshort-wchar",
|
||||
[Specifies the compiler flag that forces a short wchar_t])])
|
||||
WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")])
|
||||
WINE_TRY_CFLAGS([-fno-strict-aliasing])
|
||||
WINE_TRY_CFLAGS([-Wdeclaration-after-statement])
|
||||
|
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
#define __WINE_CONFIG_H
|
||||
|
||||
/* Specifies the compiler flag that forces a short wchar_t */
|
||||
#undef CC_FLAG_SHORT_WCHAR
|
||||
|
||||
/* Define to 1 if you have the <alias.h> header file. */
|
||||
#undef HAVE_ALIAS_H
|
||||
|
||||
|
|
Loading…
Reference in New Issue