bug 1224308 - Remove some Makefile cruft. r=gps
authorTed Mielczarek <ted@mielczarek.org>
Thu, 12 Nov 2015 06:39:11 -0500
changeset 274180 eda67eb9f49878fbd0d67c2a38bdc9af24e51504
parent 274179 79004346238d8aa8e571105ae9150b8a432aad19
child 274181 068571096137ed86c98864eac60cc2b750b01688
push id68505
push usertmielczarek@mozilla.com
push dateWed, 25 Nov 2015 17:29:08 +0000
treeherdermozilla-inbound@0104f1c911ca [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1224308
milestone45.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 1224308 - Remove some Makefile cruft. r=gps
js/src/shell/Makefile.in
toolkit/components/maintenanceservice/Makefile.in
toolkit/crashreporter/client/Makefile.in
--- a/js/src/shell/Makefile.in
+++ b/js/src/shell/Makefile.in
@@ -1,20 +1,14 @@
 # -*- Mode: makefile -*-
 #
 # 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/.
 
-ifeq ($(OS_ARCH),Darwin)
-ifeq ($(TARGET_CPU),x86_64)
-DARWIN_EXE_LDFLAGS += -pagezero_size 10000 -image_base 100000000
-endif
-endif
-
 ifdef QEMU_EXE
 MOZ_POST_PROGRAM_COMMAND = $(topsrcdir)/build/qemu-wrap --qemu $(QEMU_EXE) --libdir $(CROSS_LIB)
 endif
 
 # Place a GDB Python auto-load file next to the shell executable, both in
 # the build directory and in the dist/bin directory.
 PP_TARGETS += SHELL_AUTOLOAD
 SHELL_AUTOLOAD := js-gdb.py.in
--- a/toolkit/components/maintenanceservice/Makefile.in
+++ b/toolkit/components/maintenanceservice/Makefile.in
@@ -1,14 +1,12 @@
 # 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/.
 
-DIST_PROGRAM = maintenanceservice$(BIN_SUFFIX)
-
 ifndef MOZ_WINCONSOLE
 ifdef MOZ_DEBUG
 MOZ_WINCONSOLE = 1
 else
 MOZ_WINCONSOLE = 0
 endif
 endif
 
--- a/toolkit/crashreporter/client/Makefile.in
+++ b/toolkit/crashreporter/client/Makefile.in
@@ -1,17 +1,13 @@
 # vim:set ts=8 sw=8 sts=8 noet:
 # 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/.
 
-ifneq ($(OS_TARGET),Android)
-DIST_PROGRAM = crashreporter$(BIN_SUFFIX)
-endif
-
 ifeq ($(OS_ARCH),WINNT)
 MOZ_WINCONSOLE = 0
 endif
 
 ifdef MOZ_WIDGET_GTK
 OS_CXXFLAGS += $(TK_CFLAGS) $(MOZ_GTHREAD_CFLAGS)
 endif