Bug 1265627 - Remove the CXX_VERSION AC_SUBST. r?ted draft
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 19 Apr 2016 15:45:34 +0900
changeset 353132 64bc640ce4aab205cc28d32aec44f61298695cd3
parent 353131 740959205d6521f2d472204f8842c8ecf7faf9cc
child 353133 5ed49be2b186bf7409285158e7f03d73bb3e232e
child 353147 b4e6a11adf28b9e99cff7ac4d7f17f5e262b950b
push id15875
push userbmo:mh+mozilla@glandium.org
push dateTue, 19 Apr 2016 07:07:13 +0000
reviewersted
bugs1265627
milestone48.0a1
Bug 1265627 - Remove the CXX_VERSION AC_SUBST. r?ted Its only use is in buildconfig.html, and configure guarantees it's always the same version as CC_VERSION, so just use that.
js/src/old-configure.in
old-configure.in
toolkit/content/buildconfig.html
toolkit/content/moz.build
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -2599,17 +2599,16 @@ AC_SUBST(DLL_PREFIX)
 AC_SUBST(DLL_SUFFIX)
 AC_DEFINE_UNQUOTED(MOZ_DLL_SUFFIX, "$DLL_SUFFIX")
 AC_SUBST(LIB_SUFFIX)
 AC_SUBST(OBJ_SUFFIX)
 AC_SUBST(BIN_SUFFIX)
 AC_SUBST(IMPORT_LIB_SUFFIX)
 AC_SUBST(USE_N32)
 AC_SUBST(CC_VERSION)
-AC_SUBST(CXX_VERSION)
 AC_SUBST(MSMANIFEST_TOOL)
 AC_SUBST(MOZ_LINKER)
 AC_SUBST(WIN32_CONSOLE_EXE_LDFLAGS)
 AC_SUBST(WIN32_GUI_EXE_LDFLAGS)
 
 AC_CHECK_FUNCS(posix_fadvise posix_fallocate)
 
 dnl Set various defines and substitutions
--- a/old-configure.in
+++ b/old-configure.in
@@ -7205,17 +7205,16 @@ AC_SUBST(DLL_PREFIX)
 AC_SUBST(DLL_SUFFIX)
 AC_DEFINE_UNQUOTED(MOZ_DLL_SUFFIX, "$DLL_SUFFIX")
 AC_SUBST(LIB_SUFFIX)
 AC_SUBST(OBJ_SUFFIX)
 AC_SUBST(BIN_SUFFIX)
 AC_SUBST(IMPORT_LIB_SUFFIX)
 AC_SUBST(USE_N32)
 AC_SUBST(CC_VERSION)
-AC_SUBST(CXX_VERSION)
 AC_SUBST(MSMANIFEST_TOOL)
 AC_SUBST(NS_ENABLE_TSF)
 AC_SUBST(WIN32_CONSOLE_EXE_LDFLAGS)
 AC_SUBST(WIN32_GUI_EXE_LDFLAGS)
 
 AC_SUBST(MOZ_VORBIS)
 AC_SUBST(MOZ_TREMOR)
 AC_SUBST(MOZ_FFVPX)
--- a/toolkit/content/buildconfig.html
+++ b/toolkit/content/buildconfig.html
@@ -44,17 +44,17 @@
     </tr>
     <tr>
       <td>@CC@</td>
       <td>@CC_VERSION@</td>
       <td>@CFLAGS@</td>
     </tr>
     <tr>
       <td>@CXX@</td>
-      <td>@CXX_VERSION@</td>
+      <td>@CC_VERSION@</td>
 #ifndef BUILD_FASTER
       <td>@CXXFLAGS@ @CPPFLAGS@</td>
 #endif
     </tr>
   </tbody>
 </table>
 <h2>Configure options</h2>
 <p>@MOZ_CONFIGURE_OPTIONS@</p>
--- a/toolkit/content/moz.build
+++ b/toolkit/content/moz.build
@@ -1,18 +1,17 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['tests']
 
-for var in ('target', 'MOZ_CONFIGURE_OPTIONS', 'CC', 'CC_VERSION',
-            'CXX', 'CXX_VERSION'):
+for var in ('target', 'MOZ_CONFIGURE_OPTIONS', 'CC', 'CC_VERSION', 'CXX'):
     DEFINES[var] = CONFIG[var]
 
 DEFINES['CFLAGS'] = CONFIG['OS_CFLAGS']
 
 if CONFIG['OS_TARGET'] == 'Android':
     DEFINES['ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME']
 
 if CONFIG['MOZ_ANDROID_CXX_STL'] == 'mozstlport':