Bug 1255763 - Remove OS_VERS and OS_VERSION draft
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 11 Mar 2016 19:50:07 +0900
changeset 339471 47788e1b9388559d6fc3d777239c1cd3ab33364d
parent 339470 bcba2c17255203b2a5a0627a26622a66cd11337a
child 339472 8ab8a9f9b874a407ca229211979a4f8793584a7d
push id12739
push userbmo:mh+mozilla@glandium.org
push dateFri, 11 Mar 2016 11:11:55 +0000
bugs1255763
milestone48.0a1
Bug 1255763 - Remove OS_VERS and OS_VERSION 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)