From dda4822d6fa0fb4bce9cacc2f44a2469613758a0 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Tue, 19 Apr 2016 15:45:34 +0900 Subject: [PATCH] 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 | 1 - old-configure.in | 1 - toolkit/content/buildconfig.html | 2 +- toolkit/content/moz.build | 3 +-- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/js/src/old-configure.in b/js/src/old-configure.in index 9ea9b0263239..b7e90a8284b5 100644 --- a/js/src/old-configure.in +++ b/js/src/old-configure.in @@ -2604,7 +2604,6 @@ 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) diff --git a/old-configure.in b/old-configure.in index e14450458bcc..abe3b1dcbf9e 100644 --- a/old-configure.in +++ b/old-configure.in @@ -7210,7 +7210,6 @@ 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) diff --git a/toolkit/content/buildconfig.html b/toolkit/content/buildconfig.html index b3332073dabb..d3373f54c1ef 100644 --- a/toolkit/content/buildconfig.html +++ b/toolkit/content/buildconfig.html @@ -49,7 +49,7 @@ @CXX@ - @CXX_VERSION@ + @CC_VERSION@ #ifndef BUILD_FASTER @CXXFLAGS@ @CPPFLAGS@ #endif diff --git a/toolkit/content/moz.build b/toolkit/content/moz.build index 2e5a389b7509..1b670a1b896f 100644 --- a/toolkit/content/moz.build +++ b/toolkit/content/moz.build @@ -6,8 +6,7 @@ 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']