911634 - mach fails to incrementally rebuild specified directories (config/makefiles/mozconfig.mk:33:0:2:1:Fix above errors before continuing.)

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Mark Hammond [:markh] [:mhammond]]

After a full rebuild, the following commands fail:
./mach build browser/base
./mach build toolkit/components/thumbnails
(and I assume many other directories fail in the same way - these are just the 2 I tried)

The output in both cases is:

 0:00.17 C:/mozilla-build/msys/bin/sh.exe -c c:/mozilla-build/python/python.exe o:/src/mozilla-git/central/build/pymake/make.py -C browser/base -j8 -s
 0:00.58 evaluation from o:\src\mozilla-git\central\config\makefiles\mozconfig.mk:33:0:2:1:Fix above errors before continuing.
2

I'm guessing this was caused by bug 903118.  Note that a normal "./mach build" works fine.

Comment 1

[Mark Hammond [:markh] [:mhammond]]

FTR, locally backing out https://hg.mozilla.org/mozilla-central/rev/6fe5a446b775 (from bug 903118) solves the problem for me.

Comment 2

[Mike Hommey [:glandium]]

Attachment: Create a .mozconfig.mk in the objdir when starting a build, and include it from config.mk

Kind of ironically, a year ago, I was removing $(topsrcdir)/.mozconfig.mk (which was, then, only used in client.mk). This kind of brings it back, but in the objdir.

Comment 3

[Mike Hommey [:glandium]]

Also note this essentially backs out bug 903118.

Comment 4

[Gregory Szorc [:gps]]

Comment on attachment 798719 [details] [diff] [review]
Create a .mozconfig.mk in the objdir when starting a build, and include it from config.mk

Review of attachment 798719 [details] [diff] [review]:
-----------------------------------------------------------------

I feel I should review this since I reviewed the bug that regressed this.

I hate backing out another bug and replacing the solution like this. But, if it's necessary, then oh well.

Any chance you can submit a patch against the backed out source instead of lumping everything together?

Comment 5

[Mike Hommey [:glandium]]

Attachment: Create a .mozconfig.mk in the objdir when starting a build, and include it from config.mk

Same patch, against a backout of bug 903118, and with an additional filter to only output export lines to .mozconfig.mk

Comment 6

[Gregory Szorc [:gps]]

Comment on attachment 799176 [details] [diff] [review]
Create a .mozconfig.mk in the objdir when starting a build, and include it from config.mk

Review of attachment 799176 [details] [diff] [review]:
-----------------------------------------------------------------

::: client.mk
@@ +203,5 @@
> +# For now, only output "export" lines from mozconfig2client-mk output.
> +$(OBJDIR)/.mozconfig.mk: $(FOUND_MOZCONFIG) $(call mkdir_deps,$(OBJDIR))
> +	( $(foreach line,$(filter export||%,$(MOZCONFIG_OUT_LINES)), echo "$(subst ||, ,$(line))";) ) > $@
> +
> +# Include that makefile so that it is created. This should not actually change

Clever.

Comment 7

[Mike Hommey [:glandium]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/34ca46861c28

Comment 9

[Mike Hommey [:glandium]]

Fixup:
https://hg.mozilla.org/integration/mozilla-inbound/rev/0016284ded20

Comment 10

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/34ca46861c28
https://hg.mozilla.org/mozilla-central/rev/0016284ded20