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

Bug 781431 - A few minor build system improvements. r=ted

Browse Source 
1. mozconfig2client-mk still refers to $HOME/.mozconfig, even though we
removed it a while ago. Thanks to Neil for pointing it out.
2. MOZCONFIG_FIND and MOZCONFIG_MODULES are no longer used by client.mk.
3. Make CONFIG_GUESS a script that runs just once per client.mk invocation.

--HG--
extra : rebase_source : ec75ebcc5cea004f64abafb8a219e828234237de
This commit is contained in:
Siddharth Agarwal 2012-08-15 22:06:43 +05:30
parent a325459087
commit 4a2d60c32f
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/autoconf/mozconfig2client-mk
View File

@ -10,11 +10,10 @@
# See mozconfig2configure for more details # See mozconfig2configure for more details
print_header() { print_header() {
_mozconfig=${MOZCONFIG:-$HOME/.mozconfig}
cat <<EOF cat <<EOF
# gmake # gmake
# This file is automatically generated for client.mk. # This file is automatically generated for client.mk.
# Do not edit. Edit $_mozconfig instead. # Do not edit. Edit $FOUND_MOZCONFIG instead.
EOF EOF
} }
@ -53,8 +52,6 @@ scriptdir=`dirname $0`
topsrcdir=$1 topsrcdir=$1
opts="" opts=""
print_header
# If the path changes, configure should be rerun # If the path changes, configure should be rerun
echo "# PATH=$PATH" echo "# PATH=$PATH"
@ -72,6 +69,7 @@ fi
if [ -n $isfoundset ]; then if [ -n $isfoundset ]; then
if [ "$FOUND_MOZCONFIG" ] if [ "$FOUND_MOZCONFIG" ]
then then
print_header
. "$FOUND_MOZCONFIG" . "$FOUND_MOZCONFIG"
fi fi
echo "export FOUND_MOZCONFIG := $FOUND_MOZCONFIG" echo "export FOUND_MOZCONFIG := $FOUND_MOZCONFIG"

4
client.mk
View File

@ -70,7 +70,7 @@ PYTHON ?= python
CONFIG_GUESS_SCRIPT := $(wildcard $(TOPSRCDIR)/build/autoconf/config.guess) CONFIG_GUESS_SCRIPT := $(wildcard $(TOPSRCDIR)/build/autoconf/config.guess)
ifdef CONFIG_GUESS_SCRIPT ifdef CONFIG_GUESS_SCRIPT
CONFIG_GUESS = $(shell $(CONFIG_GUESS_SCRIPT)) CONFIG_GUESS := $(shell $(CONFIG_GUESS_SCRIPT))
endif endif
@ -92,8 +92,6 @@ endif
# See build pages, http://www.mozilla.org/build/ for how to set up mozconfig. # See build pages, http://www.mozilla.org/build/ for how to set up mozconfig.
MOZCONFIG_LOADER := build/autoconf/mozconfig2client-mk MOZCONFIG_LOADER := build/autoconf/mozconfig2client-mk
MOZCONFIG_FINDER := build/autoconf/mozconfig-find
MOZCONFIG_MODULES := build/unix/uniq.pl
define CR define CR