author | Siddharth Agarwal <sid.bugzilla@gmail.com> |
Wed, 15 Aug 2012 22:06:43 +0530 | |
changeset 102440 | 26b8e99cb58bde9bc506ce74c9e2f2132ed06432 |
parent 102439 | 1a78fe7fa40a8ce72b0d00b9154d48c676b2a2d2 |
child 102441 | cddb8d3836dfd3eac84f8d9b9300188dd7debe3a |
push id | 23287 |
push user | ryanvm@gmail.com |
push date | Thu, 16 Aug 2012 01:37:50 +0000 |
treeherder | mozilla-central@50e4ff05741e [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | ted |
bugs | 781431 |
milestone | 17.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
|
build/autoconf/mozconfig2client-mk | file | annotate | diff | comparison | revisions | |
client.mk | file | annotate | diff | comparison | revisions |
--- a/build/autoconf/mozconfig2client-mk +++ b/build/autoconf/mozconfig2client-mk @@ -5,21 +5,20 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # mozconfig2client-mk - Translates .mozconfig into options for client.mk. # Prints defines to stdout. # # See mozconfig2configure for more details print_header() { - _mozconfig=${MOZCONFIG:-$HOME/.mozconfig} cat <<EOF # gmake # This file is automatically generated for client.mk. -# Do not edit. Edit $_mozconfig instead. +# Do not edit. Edit $FOUND_MOZCONFIG instead. EOF } ac_add_options() { echo "# $* is used by configure (not client.mk)" } @@ -48,18 +47,16 @@ mk_echo_options() { # Main #-------------------------------------------------- scriptdir=`dirname $0` topsrcdir=$1 opts="" -print_header - # If the path changes, configure should be rerun echo "# PATH=$PATH" # If FOUND_MOZCONFIG isn't set, look for it and make sure the script doesn't error out isfoundset=${FOUND_MOZCONFIG+yes} if [ -z $isfoundset ]; then FOUND_MOZCONFIG=`$scriptdir/mozconfig-find $topsrcdir` if [ $? -ne 0 ]; then @@ -67,16 +64,17 @@ if [ -z $isfoundset ]; then else isfoundset=yes fi fi if [ -n $isfoundset ]; then if [ "$FOUND_MOZCONFIG" ] then + print_header . "$FOUND_MOZCONFIG" fi echo "export FOUND_MOZCONFIG := $FOUND_MOZCONFIG" if [ "$opts" ]; then mk_echo_options fi fi
--- a/client.mk +++ b/client.mk @@ -65,17 +65,17 @@ AUTOCONF=$(error Could not find autoconf endif SH := /bin/sh PERL ?= perl PYTHON ?= python CONFIG_GUESS_SCRIPT := $(wildcard $(TOPSRCDIR)/build/autoconf/config.guess) ifdef CONFIG_GUESS_SCRIPT - CONFIG_GUESS = $(shell $(CONFIG_GUESS_SCRIPT)) + CONFIG_GUESS := $(shell $(CONFIG_GUESS_SCRIPT)) endif #################################### # Sanity checks ifneq (,$(findstring mingw,$(CONFIG_GUESS))) # check for CRLF line endings @@ -87,18 +87,16 @@ endif endif #################################### # Load mozconfig Options # See build pages, http://www.mozilla.org/build/ for how to set up mozconfig. MOZCONFIG_LOADER := build/autoconf/mozconfig2client-mk -MOZCONFIG_FINDER := build/autoconf/mozconfig-find -MOZCONFIG_MODULES := build/unix/uniq.pl 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