Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out changeset 6fe5a446b775 (bug 903118)

Browse Source
This commit is contained in:
Mike Hommey 2013-09-05 09:01:44 +09:00
parent a6a6502733
commit 04daefa195
5 changed files with 12 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client.mk
View File

@ -104,9 +104,18 @@ endif
# Load mozconfig Options
# See build pages, http://www.mozilla.org/build/ for how to set up mozconfig.
# mozconfig.mk needs to be loaded multiple times by configure, so we don't check
# for INCLUDED_MOZCONFIG_MK
include $(TOPSRCDIR)/config/makefiles/mozconfig.mk
MOZCONFIG_LOADER := build/autoconf/mozconfig2client-mk
define CR
endef
# As $(shell) doesn't preserve newlines, use sed to replace them with an
# unlikely sequence (||), which is then replaced back to newlines by make
# before evaluation.
$(eval $(subst ||,$(CR),$(shell _PYMAKE=$(.PYMAKE) $(TOPSRCDIR)/$(MOZCONFIG_LOADER) $(TOPSRCDIR) 2> $(TOPSRCDIR)/.mozconfig.out | sed 's/$$/||/')))
ifdef AUTOCLOBBER
export AUTOCLOBBER=1

33
config/makefiles/mozconfig.mk
View File

@ -1,33 +0,0 @@
# -*- makefile -*-
# 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/.
#
INCLUDED_MOZCONFIG_MK = 1
# We are pulling in the mozconfig exports, so we only need to run once for the
# whole make process tree (not for each sub-make). Export this so the sub-makes
# don't read mozconfig multiple times.
export INCLUDED_MOZCONFIG_MK
MOZCONFIG_LOADER := build/autoconf/mozconfig2client-mk
define CR
endef
# topsrcdir is used by rules.mk (set from the generated Makefile), while
# TOPSRCDIR is used by client.mk
ifneq (,$(topsrcdir))
top := $(topsrcdir)
else
top := $(TOPSRCDIR)
endif
# As $(shell) doesn't preserve newlines, use sed to replace them with an
# unlikely sequence (||), which is then replaced back to newlines by make
# before evaluation.
$(eval $(subst ||,$(CR),$(shell _PYMAKE=$(.PYMAKE) $(top)/$(MOZCONFIG_LOADER) $(top) 2> $(top)/.mozconfig.out | sed 's/$$/||/')))

4
config/rules.mk
View File

@ -10,10 +10,6 @@ ifndef topsrcdir
$(error topsrcdir was not set))
endif
ifndef INCLUDED_MOZCONFIG_MK
include $(topsrcdir)/config/makefiles/mozconfig.mk
endif
# Integrate with mozbuild-generated make files. We first verify that no
# variables provided by the automatically generated .mk files are
# present. If they are, this is a violation of the separation of

33
js/src/config/makefiles/mozconfig.mk
View File

@ -1,33 +0,0 @@
# -*- makefile -*-
# 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/.
#
INCLUDED_MOZCONFIG_MK = 1
# We are pulling in the mozconfig exports, so we only need to run once for the
# whole make process tree (not for each sub-make). Export this so the sub-makes
# don't read mozconfig multiple times.
export INCLUDED_MOZCONFIG_MK
MOZCONFIG_LOADER := build/autoconf/mozconfig2client-mk
define CR
endef
# topsrcdir is used by rules.mk (set from the generated Makefile), while
# TOPSRCDIR is used by client.mk
ifneq (,$(topsrcdir))
top := $(topsrcdir)
else
top := $(TOPSRCDIR)
endif
# As $(shell) doesn't preserve newlines, use sed to replace them with an
# unlikely sequence (||), which is then replaced back to newlines by make
# before evaluation.
$(eval $(subst ||,$(CR),$(shell _PYMAKE=$(.PYMAKE) $(top)/$(MOZCONFIG_LOADER) $(top) 2> $(top)/.mozconfig.out | sed 's/$$/||/')))

4
js/src/config/rules.mk
View File

@ -10,10 +10,6 @@ ifndef topsrcdir
$(error topsrcdir was not set))
endif
ifndef INCLUDED_MOZCONFIG_MK
include $(topsrcdir)/config/makefiles/mozconfig.mk
endif
# Integrate with mozbuild-generated make files. We first verify that no
# variables provided by the automatically generated .mk files are
# present. If they are, this is a violation of the separation of