Dean M Greer : configure: Remove Xcode 3.x check.

Alexandre Julliard julliard at winehq.org
Mon Dec 28 16:09:48 CST 2020


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

Author: Dean M Greer <gcenx83 at gmail.com>
Date:   Sun Dec 27 19:06:34 2020 -0500

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 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 configure    | 39 ---------------------------------------
 configure.ac | 18 ------------------
 2 files changed, 57 deletions(-)

diff --git a/configure b/configure
index 471d6517178..3cc5bbc724f 100755
--- a/configure
+++ b/configure
@@ -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"
diff --git a/configure.ac b/configure.ac
index dafa8489b71..beabfeb761c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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, at loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version"])
     AC_SUBST(WINELOADER_DEPENDS,"wine_info.plist")




More information about the wine-cvs mailing list