mozilla-add-glibcxx_use_cxx11_abi.patch
branchfirefox38
changeset 852 e11af0d6cb48
equal deleted inserted replaced
851:0855c4ac4793 852:e11af0d6cb48
       
     1 From 32b9943e0d2c7c28d9d113c0e83d121c356fe5d5 Mon Sep 17 00:00:00 2001
       
     2 From: Mike Hommey <mh+mozilla@glandium.org>
       
     3 Date: Fri, 10 Apr 2015 16:53:05 +0900
       
     4 Subject: [PATCH] Bug 1153109 - Add -D_GLIBCXX_USE_CXX11_ABI=0 to CXXFLAGS when
       
     5  building with --enable-stdcxx-compat
       
     6 
       
     7 patch grab from https://bugzilla.mozilla.org/show_bug.cgi?id=1153109
       
     8 
       
     9 ---
       
    10  configure.in | 2 ++
       
    11  1 file changed, 2 insertions(+)
       
    12 
       
    13 diff --git a/configure.in b/configure.in
       
    14 index 95d2a70..6c858b3 100644
       
    15 --- a/configure.in
       
    16 +++ b/configure.in
       
    17 @@ -7375,16 +7375,18 @@ STDCXX_COMPAT=
       
    18  MOZ_ARG_ENABLE_BOOL(stdcxx-compat,
       
    19  [  --enable-stdcxx-compat  Enable compatibility with older libstdc++],
       
    20      STDCXX_COMPAT=1)
       
    21  
       
    22  if test -n "$STDCXX_COMPAT"; then
       
    23     eval $(CXX="$CXX" HOST_CXX="$HOST_CXX" $PYTHON -m mozbuild.configure.libstdcxx)
       
    24     AC_SUBST(MOZ_LIBSTDCXX_TARGET_VERSION)
       
    25     AC_SUBST(MOZ_LIBSTDCXX_HOST_VERSION)
       
    26 +   CXXFLAGS="$CXXFLAGS -D_GLIBCXX_USE_CXX11_ABI=0"
       
    27 +   HOST_CXXFLAGS="$HOST_CXXFLAGS -D_GLIBCXX_USE_CXX11_ABI=0"
       
    28  fi
       
    29  
       
    30  dnl ========================================================
       
    31  dnl =
       
    32  dnl = Profiling and Instrumenting
       
    33  dnl =
       
    34  dnl ========================================================
       
    35  MOZ_ARG_HEADER(Profiling and Instrumenting)