Remove CY_ARCH (Substrate now handles this quirk).

diff --git a/Makefile.in b/Makefile.in
index 2b12324e04717d0fe40ec6e48c3a387fd6c9d01c..b2a3d60b7929111f0f7e95da4199520aa92b111f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -394,7 +394,6 @@ CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@

-CY_ARCH = @CY_ARCH@

 CY_EXECUTE = @CY_EXECUTE@
 CY_JAVA = @CY_JAVA@
 CY_OBJECTIVEC = @CY_OBJECTIVEC@
 CY_EXECUTE = @CY_EXECUTE@
 CY_JAVA = @CY_JAVA@
 CY_OBJECTIVEC = @CY_OBJECTIVEC@

diff --git a/configure b/configure
index 8614b57e2931fe72b00f0f052a4684f89bfe1726..afffca95935c79ea81d487393b88ce244c765c50 100755 (executable)
--- a/configure
+++ b/configure
@@ -665,7 +665,6 @@ LTJAVASCRIPTCORE
 WEBKIT_LIBS
 WEBKIT_CFLAGS
 CY_EXECUTE
 WEBKIT_LIBS
 WEBKIT_CFLAGS
 CY_EXECUTE

-CY_ARCH

 PTHREAD_CFLAGS
 PTHREAD_LIBS
 PTHREAD_CC
 PTHREAD_CFLAGS
 PTHREAD_LIBS
 PTHREAD_CC


@@ -19516,90 +19515,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 
 
 
 

-for cy_arch in ppc ppc64 i386 x86_64 armv6 arm64; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -arch $cy_arch" >&5
-$as_echo_n "checking for -arch $cy_arch... " >&6; }
-
-    cy_save=$CXXFLAGS
-
-  for element in "-arch $cy_arch"; do
-    haveit=
-    for x in $CXXFLAGS; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element"
-    fi
-  done
-
-
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  cy_good=1
-else
-  cy_good=0
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-    CXXFLAGS=$cy_save
-    if test "x$cy_good" = x1; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-  for element in "-arch $cy_arch"; do
-    haveit=
-    for x in $CY_ARCH; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      CY_ARCH="${CY_ARCH}${CY_ARCH:+ }$element"
-    fi
-  done
-
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-done
-
-

 
 
 
 
 
 

diff --git a/configure.ac b/configure.ac
index 7f23cf3d6c1f770a0e635c789f377b0a9eb29ddd..de80c5306bcbc694244562ac499ac252eb4f46c5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -137,19 +137,6 @@ AC_DEFUN([CY_LT_LIB], [
     AC_SUBST(]$1[)
 ])
 
     AC_SUBST(]$1[)
 ])
 

-dnl -arch * {{{
-for cy_arch in ppc ppc64 i386 x86_64 armv6 arm64; do
-    AC_MSG_CHECKING([for -arch $cy_arch])
-    CY_TRY([CXXFLAGS], ["-arch $cy_arch"], [
-        AC_TRY_LINK([], [], [CY_SUCCESS], [CY_FAILURE])
-    ], [
-        AC_MSG_RESULT([yes])
-        AC_LIB_APPENDTOVAR([CY_ARCH], ["-arch $cy_arch"])
-    ], [AC_MSG_RESULT([no])])
-done
-AC_SUBST([CY_ARCH])
-dnl }}}
-

 dnl --enable-javascript {{{
 AC_DEFUN([CY_CHECK_JAVASCRIPTCORE], [
     CY_LT_LIB([LTJAVASCRIPTCORE], [AC_SEARCH_LIBS([JSEvaluateScript], [JavaScriptCore], [
 dnl --enable-javascript {{{
 AC_DEFUN([CY_CHECK_JAVASCRIPTCORE], [
     CY_LT_LIB([LTJAVASCRIPTCORE], [AC_SEARCH_LIBS([JSEvaluateScript], [JavaScriptCore], [