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

configure: Remove Xcode 3.x check. 

Check causes issues with newer Xcode versions. Xcode 3.x is unable to compile modern wine.

Signed-off-by: Dean M Greer <gcenx83@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Dean M Greer 2020-12-27 19:06:34 -05:00 committed by Alexandre Julliard
parent dbafbcb562
commit ff09f14867
2 changed files with 0 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
configure vendored
View File

@ -9079,45 +9079,6 @@ if test "x$ac_cv_func_CGDisplayModeGetWidth" = xyes; then :
fi
LIBS="$ac_save_LIBS"
fi
if test "x$enable_win16" = "xyes"
then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether 16-bit code can be built correctly" >&5
$as_echo_n "checking whether 16-bit code can be built correctly... " >&6; }
if test "$cross_compiling" = yes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compiling, assuming yes" >&5
$as_echo "cross-compiling, assuming yes" >&6; }
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
asm(".text\n"
"bad:\tnop;nop\n"
"good:\tnop;nop\n\t"
".globl _testfunc\n"
"_testfunc:\tcallw good");
extern void testfunc();
int
main ()
{
unsigned short *p = (unsigned short *)testfunc;
return p[0] != 0xe866 || p[1] != 0xfffa
;
return 0;
}
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
as_fn_error $? "Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support." "$LINENO" 5
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
fi
LIBWINE_SHAREDLIB="libwine.$libwine_version.dylib"

18
configure.ac
View File

@ -866,24 +866,6 @@ case $host_os in
LIBS="$ac_save_LIBS"
fi
dnl Check for Xcode 3.x broken 16-bit support
if test "x$enable_win16" = "xyes"
then
AC_MSG_CHECKING([whether 16-bit code can be built correctly])
AC_RUN_IFELSE([AC_LANG_PROGRAM([[asm(".text\n"
"bad:\tnop;nop\n"
"good:\tnop;nop\n\t"
".globl _testfunc\n"
"_testfunc:\tcallw good");
extern void testfunc();]],
[[unsigned short *p = (unsigned short *)testfunc;
return p[0] != 0xe866 || p[1] != 0xfffa]])],
AC_MSG_RESULT(yes),
[AC_MSG_RESULT(no)
AC_MSG_ERROR([Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support.])],
AC_MSG_RESULT([[cross-compiling, assuming yes]]))
fi
AC_SUBST(LIBWINE_SHAREDLIB,"libwine.$libwine_version.dylib")
AC_SUBST(LIBWINE_LDFLAGS,["-dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version"])
AC_SUBST(WINELOADER_DEPENDS,"wine_info.plist")