Bug 1255763 - Remove OS_VERS and OS_VERSION. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 11 Mar 2016 19:50:07 +0900
changeset 339724 a158035151926d9ac4800274f97372f02a3c7a33
parent 339723 fb25fdcdae78ff81ca54e7b74de5bd039a0733b3
child 339725 8227f48198ec361c2c0ba7589c0f536f1037540f
push id12803
push userjbeich@FreeBSD.org
push dateSun, 13 Mar 2016 09:48:54 +0000
reviewersgps
bugs1255763
milestone48.0a1
Bug 1255763 - Remove OS_VERS and OS_VERSION. r=gps They were behind WANT_MOZILLA_CONFIG_OS_VERSION, which nothing has been setting ever since the ifdef was changed from MOZILLA_CONFIG_IGNORE_OS_VERSION... in 2000. Not that anything was setting MOZILLA_CONFIG_IGNORE_OS_VERSION either... well, at least not in Gecko.
config/config.mk
--- a/config/config.mk
+++ b/config/config.mk
@@ -121,23 +121,16 @@ AUTOCONF_TOOLS	= $(MOZILLA_DIR)/build/au
 
 #
 # Strip off the excessively long version numbers on these platforms,
 # but save the version to allow multiple versions of the same base
 # platform to be built in the same tree.
 #
 ifneq (,$(filter FreeBSD HP-UX Linux NetBSD OpenBSD SunOS,$(OS_ARCH)))
 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
 
 ifdef _MSC_VER
 CC_WRAPPER ?= $(call py_action,cl)
 CXX_WRAPPER ?= $(call py_action,cl)
 endif # _MSC_VER
 
 CC := $(CC_WRAPPER) $(CC)