mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
bug 877937 - make js embedders build as c++11 when we do r=ted f=waldo
This commit is contained in:
parent
01cd094f3b
commit
0ca931dfde
@ -517,7 +517,8 @@ JS_CONFIG_SUBSTITUTIONS=\
|
||||
-DMOZJS_PATCH_VERSION="$(MOZJS_PATCH_VERSION)" \
|
||||
-DMOZJS_ALPHA="$(MOZJS_ALPHA)" \
|
||||
-DNSPR_CFLAGS="$(NSPR_CFLAGS)" \
|
||||
-DNSPR_PKGCONF_CHECK="$(NSPR_PKGCONF_CHECK)"
|
||||
-DNSPR_PKGCONF_CHECK="$(NSPR_PKGCONF_CHECK)" \
|
||||
-DUSE_CXX11="$(USE_CXX11)"
|
||||
|
||||
$(JS_CONFIG_NAME): js-config.in Makefile $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk $(topsrcdir)/config/rules.mk
|
||||
$(RM) $@.tmp
|
||||
|
@ -2338,6 +2338,7 @@ AC_LANG_CPLUSPLUS
|
||||
if test "$GNU_CXX"; then
|
||||
_SAVE_CXXFLAGS=$CXXFLAGS
|
||||
CXXFLAGS="$CXXFLAGS -std=gnu++0x"
|
||||
USE_CXX11=1
|
||||
|
||||
AC_CACHE_CHECK(for gcc c++0x headers bug without rtti,
|
||||
ac_cv_cxx0x_headers_bug,
|
||||
@ -2355,9 +2356,11 @@ if test "$GNU_CXX"; then
|
||||
|
||||
if test "ac_cv_cxx0x_clang_workaround" = "no"; then
|
||||
CXXFLAGS="$_SAVE_CXXFLAGS"
|
||||
USE_CXX11=
|
||||
fi
|
||||
elif test "$ac_cv_cxx0x_headers_bug" = "yes"; then
|
||||
CXXFLAGS="$_SAVE_CXXFLAGS"
|
||||
USE_CXX11=
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -4331,6 +4334,7 @@ AC_SUBST(OS_TEST)
|
||||
AC_SUBST(CPU_ARCH)
|
||||
AC_SUBST(INTEL_ARCHITECTURE)
|
||||
|
||||
AC_SUBST(USE_CXX11)
|
||||
AC_SUBST(WRAP_LDFLAGS)
|
||||
AC_SUBST(MKSHLIB)
|
||||
AC_SUBST(MKCSHLIB)
|
||||
|
@ -109,7 +109,11 @@ if test "$echo_libdir" = "yes"; then
|
||||
fi
|
||||
|
||||
if test "$echo_cflags" = "yes"; then
|
||||
echo "-include $includedir/$LIBRARY_NAME/js/RequiredDefines.h -I$includedir/$LIBRARY_NAME $NSPR_CFLAGS"
|
||||
cflags="-include $includedir/$LIBRARY_NAME/js/RequiredDefines.h -I$includedir/$LIBRARY_NAME $NSPR_CFLAGS"
|
||||
if test '@USE_CXX11@' = "1"; then
|
||||
cflags="$cflags -std=gnu++0x"
|
||||
fi
|
||||
echo $cflags
|
||||
fi
|
||||
|
||||
if test "$echo_libs" = "yes"; then
|
||||
|
Loading…
Reference in New Issue
Block a user