Bug 988168 - Fixup xul.dll link wrapping to please buildbot config by outputting linker-vsize in toolkit/library. r=me,DONTBUILD
☠☠ backed out by 2db12b4898e2 ☠ ☠
authorMike Hommey <mh+mozilla@glandium.org>
Sat, 29 Mar 2014 12:08:08 +0900
changeset 194524 a92851ff74440a8bdd53682bc8569bc478ecfde1
parent 194523 3cb985aa114c2e8812deeeb52cdb6a530b0f437e
child 194525 e51a54f1817dba426234de76938e7fdc6792ad07
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, DONTBUILD
bugs988168
milestone31.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 988168 - Fixup xul.dll link wrapping to please buildbot config by outputting linker-vsize in toolkit/library. r=me,DONTBUILD
toolkit/library/build/Makefile.in
toolkit/library/libxul.mk
--- a/toolkit/library/build/Makefile.in
+++ b/toolkit/library/build/Makefile.in
@@ -1,14 +1,19 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include $(topsrcdir)/toolkit/library/libxul.mk
 
+ifeq (WINNT_1,$(OS_TARGET)_$(MOZ_PROFILE_USE))
+# Wrap linker to measure peak virtual memory usage.
+LD := $(PYTHON) $(topsrcdir)/build/link.py $(DEPTH)/toolkit/library/linker-vsize $(LD)
+endif
+
 ifneq (,$(filter WINNT,$(OS_ARCH)))
 SDK_LIBRARY = $(IMPORT_LIBRARY)
 else
 SDK_LIBRARY = $(SHARED_LIBRARY)
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/toolkit/library/libxul.mk
+++ b/toolkit/library/libxul.mk
@@ -256,13 +256,8 @@ LIBXUL_AUTOLOAD = $(topsrcdir)/toolkit/l
 LIBXUL_AUTOLOAD_FLAGS := -Dtopsrcdir=$(abspath $(topsrcdir))
 endif
 
 OS_LIBS += $(LIBICONV)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 OS_LIBS += $(call EXPAND_LIBNAME,usp10 oleaut32)
 endif
-
-ifeq (WINNT_1,$(OS_TARGET)_$(MOZ_PROFILE_USE))
-# Wrap linker to measure peak virtual memory usage.
-LD := $(PYTHON) $(topsrcdir)/build/link.py $(CURDIR)/linker-vsize $(LD)
-endif