wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backout 4158a1e1ddf9 (bug 1029059) for breaking jstests running

Browse Source
This commit is contained in:
Nathan Froyd 2014-06-26 09:00:51 -04:00
parent 522cf7fbea
commit a42f3c6723
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/src/configure.in
View File

@ -1443,6 +1443,7 @@ case "$target" in
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
fi fi
AC_LANG_RESTORE AC_LANG_RESTORE
TARGET_COMPILER_ABI="ibmc"
CC_VERSION=`lslpp -Lcq vac.C 2>/dev/null | awk -F: '{ print $3 }'` CC_VERSION=`lslpp -Lcq vac.C 2>/dev/null | awk -F: '{ print $3 }'`
CXX_VERSION=`lslpp -Lcq vacpp.cmp.core 2>/dev/null | awk -F: '{ print $3 }'` CXX_VERSION=`lslpp -Lcq vacpp.cmp.core 2>/dev/null | awk -F: '{ print $3 }'`
fi fi
@ -1620,6 +1621,7 @@ ia64*-hpux*)
MOZ_C_SUPPORTS_WARNING(-Wno-, format, ac_c_has_wno_format) MOZ_C_SUPPORTS_WARNING(-Wno-, format, ac_c_has_wno_format)
MOZ_CXX_SUPPORTS_WARNING(-Wno-, format, ac_cxx_has_wno_format) MOZ_CXX_SUPPORTS_WARNING(-Wno-, format, ac_cxx_has_wno_format)
else else
TARGET_COMPILER_ABI=msvc
HOST_CC='$(CC)' HOST_CC='$(CC)'
HOST_CXX='$(CXX)' HOST_CXX='$(CXX)'
HOST_LD='$(LD)' HOST_LD='$(LD)'
@ -1854,6 +1856,7 @@ ia64*-hpux*)
AS='/usr/ccs/bin/as' AS='/usr/ccs/bin/as'
ASFLAGS="$ASFLAGS -K PIC -L -P -D_ASM -D__STDC__=0" ASFLAGS="$ASFLAGS -K PIC -L -P -D_ASM -D__STDC__=0"
AS_DASH_C_FLAG='' AS_DASH_C_FLAG=''
TARGET_COMPILER_ABI="sunc"
CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'` CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'` CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
AC_MSG_CHECKING([for Sun C++ compiler version >= 5.9]) AC_MSG_CHECKING([for Sun C++ compiler version >= 5.9])
@ -2498,6 +2501,8 @@ if test "$GNU_CC"; then
ARM_ABI_PREFIX=oabi- ARM_ABI_PREFIX=oabi-
fi fi
fi fi
TARGET_COMPILER_ABI="${TARGET_COMPILER_ABI-${ARM_ABI_PREFIX}gcc3}"
fi fi
dnl Check to see if we can resolve ambiguity with |using|. dnl Check to see if we can resolve ambiguity with |using|.
@ -2654,6 +2659,11 @@ fi
AC_HAVE_FUNCS(localeconv) AC_HAVE_FUNCS(localeconv)
fi # ! SKIP_COMPILER_CHECKS fi # ! SKIP_COMPILER_CHECKS
TARGET_XPCOM_ABI=
if test -n "${CPU_ARCH}" -a -n "${TARGET_COMPILER_ABI}"; then
TARGET_XPCOM_ABI="${CPU_ARCH}-${TARGET_COMPILER_ABI}"
fi
dnl Mozilla specific options dnl Mozilla specific options
dnl ======================================================== dnl ========================================================
dnl The macros used for command line options dnl The macros used for command line options
@ -3874,6 +3884,7 @@ AC_SUBST(TARGET_VENDOR)
AC_SUBST(TARGET_OS) AC_SUBST(TARGET_OS)
AC_SUBST(TARGET_NSPR_MDCPUCFG) AC_SUBST(TARGET_NSPR_MDCPUCFG)
AC_SUBST(TARGET_MD_ARCH) AC_SUBST(TARGET_MD_ARCH)
AC_SUBST(TARGET_XPCOM_ABI)
AC_SUBST(OS_TARGET) AC_SUBST(OS_TARGET)
AC_SUBST(OS_ARCH) AC_SUBST(OS_ARCH)
AC_SUBST(OS_RELEASE) AC_SUBST(OS_RELEASE)