wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1042432 - Change how UPLOAD_EXTRA_FILES is passed down from mozconfig.cache to the build system. r=mshal

Browse Source
This commit is contained in:
Mike Hommey 2014-08-14 07:15:35 +09:00
parent 047c87f394
commit 4fda2da4f7
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/mozconfig.cache
View File

@ -60,7 +60,7 @@ else
ac_add_options "--with-compiler-wrapper=python2.7 $topsrcdir/sccache/sccache.py"
mk_add_options MOZ_PREFLIGHT_ALL+=build/sccache.mk
mk_add_options MOZ_POSTFLIGHT_ALL+=build/sccache.mk
UPLOAD_EXTRA_FILES="$UPLOAD_EXTRA_FILES sccache.log.gz"
mk_add_options "export UPLOAD_EXTRA_FILES+=sccache.log.gz"
case "$platform" in
win*)
# sccache supports a special flag to create depfiles.

6
client.mk
View File

@ -195,6 +195,12 @@ $(OBJDIR)/.mozconfig.mk: $(FOUND_MOZCONFIG) $(call mkdir_deps,$(OBJDIR)) $(OBJDI
include $(OBJDIR)/.mozconfig.mk
endif
# UPLOAD_EXTRA_FILES is appended to and exported from mozconfig, which makes
# submakes as well as configure add even more to that, so just unexport it
# for submakes to pick it from .mozconfig.mk and for configure to pick it
# from mach environment.
unexport UPLOAD_EXTRA_FILES
# Print out any options loaded from mozconfig.
all realbuild clean distclean export libs install realclean::
ifneq (,$(strip $(MOZCONFIG_OUT_FILTERED)))

2
configure.in
View File

@ -8895,8 +8895,6 @@ if test -z "$JS_SHARED_LIBRARY"; then
fi
AC_SUBST(JS_SHARED_LIBRARY)
AC_SUBST(UPLOAD_EXTRA_FILES)
MOZ_CREATE_CONFIG_STATUS()
# No need to run subconfigures when building with LIBXUL_SDK_DIR