Bug 1324210 - Don't attempt to check libstdcxx version in artifact builds. draft
authorChris Manchester <cmanchester@mozilla.com>
Mon, 23 Jan 2017 13:47:04 -0800
changeset 465153 ba6e45666dd720e89f5f99c18a9aef03be0c5596
parent 464206 3cedab21a7e65e6a1c4c2294ecfb5502575a46e3
child 543109 2517e1c541ed4839ad7671a2cb79cc83959d4e00
push id42556
push userbmo:cmanchester@mozilla.com
push dateMon, 23 Jan 2017 22:07:22 +0000
bugs1324210
milestone53.0a1
Bug 1324210 - Don't attempt to check libstdcxx version in artifact builds. MozReview-Commit-ID: Dc2RWVi6JU2
old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
@@ -4414,17 +4414,17 @@ dnl ====================================
 dnl = libstdc++ compatibility hacks
 dnl ========================================================
 
 STDCXX_COMPAT=
 MOZ_ARG_ENABLE_BOOL(stdcxx-compat,
 [  --enable-stdcxx-compat  Enable compatibility with older libstdc++],
     STDCXX_COMPAT=1)
 
-if test -n "$STDCXX_COMPAT"; then
+if test -n "$STDCXX_COMPAT" -a -n "$COMPILE_ENVIRONMENT"; then
    eval $(CXX="$CXX" HOST_CXX="$HOST_CXX" $PYTHON -m mozbuild.configure.libstdcxx)
    AC_SUBST(MOZ_LIBSTDCXX_TARGET_VERSION)
    AC_SUBST(MOZ_LIBSTDCXX_HOST_VERSION)
    CXXFLAGS="$CXXFLAGS -D_GLIBCXX_USE_CXX11_ABI=0"
    HOST_CXXFLAGS="$HOST_CXXFLAGS -D_GLIBCXX_USE_CXX11_ABI=0"
 fi
 
 dnl ========================================================