Bug 1324210 - Don't attempt to check libstdcxx version in artifact builds. r=mshal
authorChris Manchester <cmanchester@mozilla.com>
Mon, 23 Jan 2017 13:47:04 -0800
changeset 330763 3e10a2796cce7569677f0fa1ac421b778edf7705
parent 330762 b7ab800cfeeef2346e8fa03bea375a92a1a51d51
child 330764 90f3467f8b8c00d67ec880b2e1517512c084cd21
push id36432
push usercmanchester@mozilla.com
push dateTue, 24 Jan 2017 21:21:53 +0000
treeherderautoland@3e10a2796cce [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1324210
milestone54.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1324210 - Don't attempt to check libstdcxx version in artifact builds. r=mshal 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 ========================================================