Bug 959519 - Keep timestamps when copying files with nsinstall.py while nsinstall is not ready to be used yet. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 05 Feb 2014 13:02:20 +0900
changeset 166935 f3fe1eed65293e8816cd6e36e662fa16df40e5dc
parent 166874 a361550a1b5686432c87578c0d98648508c6e0b5
child 166936 a497dfd65f255b6192479ee87c0e0b4b39c4120f
push id26156
push userryanvm@gmail.com
push dateWed, 05 Feb 2014 20:21:06 +0000
treeherdermozilla-central@bd40e935d3b5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs959519
milestone30.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 959519 - Keep timestamps when copying files with nsinstall.py while nsinstall is not ready to be used yet. r=gps
config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1455,17 +1455,17 @@ endif
 # file would be $(DIST)/include/bar/baz/qux.h instead of $(DIST)/include/qux.h
 
 # If we're using binary nsinstall and it's not built yet, fallback to python nsinstall.
 ifneq (,$(filter $(DIST)/bin/nsinstall$(HOST_BIN_SUFFIX),$(install_cmd)))
 ifeq (,$(wildcard $(DIST)/bin/nsinstall$(HOST_BIN_SUFFIX)))
 nsinstall_is_usable = $(if $(wildcard $(DIST)/bin/nsinstall$(HOST_BIN_SUFFIX)),yes)
 
 define install_cmd_override
-$(1): install_cmd = $$(if $$(nsinstall_is_usable),$$(INSTALL),$$(NSINSTALL_PY)) $$(1)
+$(1): install_cmd = $$(if $$(nsinstall_is_usable),$$(INSTALL),$$(NSINSTALL_PY) -t) $$(1)
 endef
 endif
 endif
 
 install_target_tier = $(or $($(1)_TARGET),libs)
 INSTALL_TARGETS_TIERS := $(sort $(foreach category,$(INSTALL_TARGETS),$(call install_target_tier,$(category))))
 
 install_target_result = $($(1)_DEST:%/=%)/$(if $($(1)_KEEP_PATH),$(2),$(notdir $(2)))