Bug 1255763 - Remove OS_CONFIG, it is now unused. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 11 Mar 2016 19:46:33 +0900
changeset 288351 fb25fdcdae78ff81ca54e7b74de5bd039a0733b3
parent 288350 0a317c5781969d52af481dfef26e5468a94ff693
child 288352 a158035151926d9ac4800274f97372f02a3c7a33
push id73400
push usermh@glandium.org
push dateSat, 12 Mar 2016 00:17:41 +0000
treeherdermozilla-inbound@13e2c954630c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1255763
milestone48.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 1255763 - Remove OS_CONFIG, it is now unused. r=gps It was also already unused in old-configure.in.
config/config.mk
js/src/old-configure.in
old-configure.in
--- a/config/config.mk
+++ b/config/config.mk
@@ -130,18 +130,16 @@ OS_RELEASE	:= $(basename $(OS_RELEASE))
 # Allow the user to ignore the OS_VERSION, which is usually irrelevant.
 ifdef WANT_MOZILLA_CONFIG_OS_VERSION
 OS_VERS		:= $(suffix $(OS_RELEASE))
 OS_VERSION	:= $(shell echo $(OS_VERS) | sed 's/-.*//')
 endif
 
 endif
 
-OS_CONFIG	:= $(OS_ARCH)$(OS_RELEASE)
-
 ifdef _MSC_VER
 CC_WRAPPER ?= $(call py_action,cl)
 CXX_WRAPPER ?= $(call py_action,cl)
 endif # _MSC_VER
 
 CC := $(CC_WRAPPER) $(CC)
 CXX := $(CXX_WRAPPER) $(CXX)
 MKDIR ?= mkdir
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -906,17 +906,16 @@ aarch64*)
     CPU_ARCH=aarch64
     ;;
 
 esac
 
 if test -z "$OS_TARGET"; then
     OS_TARGET=$OS_ARCH
 fi
-OS_CONFIG="${OS_TARGET}${OS_RELEASE}"
 
 dnl Set INTEL_ARCHITECTURE if we're compiling for x86-32 or x86-64.
 dnl ===============================================================
 INTEL_ARCHITECTURE=
 case "$OS_TEST" in
     x86_64|i?86)
       INTEL_ARCHITECTURE=1
 esac
--- a/old-configure.in
+++ b/old-configure.in
@@ -1099,17 +1099,16 @@ mips|mipsel)
 aarch64*)
     CPU_ARCH=aarch64
     ;;
 esac
 
 if test -z "$OS_TARGET"; then
     OS_TARGET=$OS_ARCH
 fi
-OS_CONFIG="${OS_TARGET}${OS_RELEASE}"
 
 dnl Set INTEL_ARCHITECTURE if we're compiling for x86-32 or x86-64.
 dnl ===============================================================
 INTEL_ARCHITECTURE=
 case "$OS_TEST" in
     x86_64|i?86)
       INTEL_ARCHITECTURE=1
 esac