Bug 1382697 - Remove support for NSDISTMODE==absolute_symlink; r?glandium draft
authorGregory Szorc <gps@mozilla.com>
Fri, 21 Jul 2017 21:50:29 -0700
changeset 613678 f09d3dff64de1e352889e71549c786a1cca680ec
parent 613677 08a4c924d50187e3b76c604758f2f7bccc08a177
child 613679 eaba0c83eb08906f0becd4b8900528a9d234833c
push id69832
push usergszorc@mozilla.com
push dateSat, 22 Jul 2017 06:27:51 +0000
reviewersglandium
bugs1382697
milestone56.0a1
Bug 1382697 - Remove support for NSDISTMODE==absolute_symlink; r?glandium I see no practical reason for this feature. MozReview-Commit-ID: BmgP2ghcPgb
config/config.mk
--- a/config/config.mk
+++ b/config/config.mk
@@ -426,40 +426,31 @@ endif
 #
 -include $(topsrcdir)/$(MOZ_BUILD_APP)/app-config.mk
 -include $(MY_CONFIG)
 
 ######################################################################
 
 GARBAGE		+= $(DEPENDENCIES) core $(wildcard core.[0-9]*) $(wildcard *.err) $(wildcard *.pure) $(wildcard *_pure_*.o) Templates.DB
 
-ifeq ($(OS_ARCH),Darwin)
-ifndef NSDISTMODE
-NSDISTMODE=absolute_symlink
-endif
-PWD := $(CURDIR)
-endif
-
 NSINSTALL_PY := $(PYTHON) $(abspath $(MOZILLA_DIR)/config/nsinstall.py)
 ifneq (,$(or $(filter WINNT,$(HOST_OS_ARCH)),$(if $(COMPILE_ENVIRONMENT),,1)))
 NSINSTALL = $(NSINSTALL_PY)
 else
 NSINSTALL = $(DEPTH)/config/nsinstall$(HOST_BIN_SUFFIX)
 endif # WINNT
 
 
 ifeq (,$(CROSS_COMPILE)$(filter-out WINNT, $(OS_ARCH)))
 INSTALL = $(NSINSTALL) -t
 
 else
 
 ifeq ($(NSDISTMODE),copy)
 INSTALL = $(NSINSTALL) -t
-else ifeq ($(NSDISTMODE),absolute_symlink)
-INSTALL = $(NSINSTALL) -L $(PWD)
 else
 INSTALL = $(NSINSTALL) -R
 endif
 
 endif # WINNT
 
 # The default for install_cmd is simply INSTALL
 install_cmd ?= $(INSTALL) $(1)