Bug 669866 - Export CXX instead of defaulting to c++. r=ted
authorMike Hommey <mh+mozilla@glandium.org>
Mon, 11 Jul 2011 07:51:01 +0200
changeset 72583 c81d9088b48aaa5c4b361fed7444e83ff9f94f3c
parent 72582 e898a773a4fbe0d6e67159d5d2c96ac328e3956f
child 72584 20076ad5675040f605253f87208038e0e3011ed2
push id20741
push usermh@glandium.org
push dateMon, 11 Jul 2011 05:59:04 +0000
treeherdermozilla-central@64d00c88b3a6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs669866
milestone8.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 669866 - Export CXX instead of defaulting to c++. r=ted
build/autoconf/libstdcxx.py
configure.in
--- a/build/autoconf/libstdcxx.py
+++ b/build/autoconf/libstdcxx.py
@@ -62,12 +62,12 @@ def find_version(e):
 
     p = subprocess.Popen(['readelf', '-V', libstdcxx], stdout=subprocess.PIPE)
     versions = [parse_readelf_line(x)
                 for x in p.stdout.readlines() if 'Name: GLIBCXX' in x]
     last_version = sorted(versions, cmp = cmp_ver)[-1]
     return encode_ver(last_version)
 
 if __name__ == '__main__':
-    cxx_env = os.environ.get('CXX', 'c++')
+    cxx_env = os.environ['CXX']
     print 'MOZ_LIBSTDCXX_TARGET_VERSION=%s' % find_version(cxx_env)
     host_cxx_env = os.environ.get('HOST_CXX', cxx_env)
     print 'MOZ_LIBSTDCXX_HOST_VERSION=%s' % find_version(host_cxx_env)
--- a/configure.in
+++ b/configure.in
@@ -7693,17 +7693,17 @@ dnl ====================================
 STDCXX_COMPAT=
 MOZ_ARG_ENABLE_BOOL(stdcxx-compat,
 [  --enable-stdcxx-compat  Enable compatibility with older libstdc++],
     STDCXX_COMPAT=stdc++compat.cpp)
 
 AC_SUBST(STDCXX_COMPAT)
 
 if test -n "$STDCXX_COMPAT"; then
-   eval $($PYTHON $_topsrcdir/build/autoconf/libstdcxx.py)
+   eval $(CXX="$CXX" $PYTHON $_topsrcdir/build/autoconf/libstdcxx.py)
    AC_SUBST(MOZ_LIBSTDCXX_TARGET_VERSION)
    AC_SUBST(MOZ_LIBSTDCXX_HOST_VERSION)
 fi
 
 dnl ========================================================
 dnl = 
 dnl = Profiling and Instrumenting
 dnl =