833863 - The wrong SplayTree.h is ending up in dist/include/mozilla, causing build error: "Cannot open include file: 'lifoalloc.h'

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Benjamin Smedberg]

I don't know why the tinderbox and everyone isn't seeing this, but it may have to do with the relative timestamp of files or something.

There are currently two SplayTree.h files in the tree: mfbt/SplayTree.h and js/src/ds/SplayTree.h. In my local clobber build, the js (wrong) one is ending up in dist/include/mozilla/SplayTree.h

This is because when we are building in js/src, we include mfbt/exported_headers.mk. This tries to install SplayTree.h, but js/src/Makefile.in puts $(srcdir)/ds in front of mfbt in the VPATH.

Comment 1

[Benjamin Smedberg]

Attachment: Put MFBT first in the VPATH, rev. 1

Comment 2

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

Comment on attachment 705424 [details] [diff] [review]
Put MFBT first in the VPATH, rev. 1

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

::: js/src/Makefile.in
@@ +57,5 @@
> +###############################################
> +# BEGIN include sources for low-level code shared with mfbt
> +#
> +MFBT_ROOT = $(srcdir)/../../mfbt
> +VPATH += $(MFBT_ROOT)

Why += instead of = like we had before?

Comment 3

[Benjamin Smedberg]

Why not? Makes it easier to refactor in the future if warranted.

Comment 4

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

/me shrugs

Comment 5

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/cf2a37861425

Comment 7

[Wolfgang Rosenauer [:wolfiR]]

For me that patch is needed to build Firefox 20 at all. Can it be considered for a patch in 20?

Comment 8

[Mike Hommey [:glandium]]

Comment on attachment 705424 [details] [diff] [review]
Put MFBT first in the VPATH, rev. 1

[Approval Request Comment]
Bug caused by (feature/regressing bug #): bug 822906
User impact if declined: Failure to build aurora
Testing completed (on m-c, etc.): Landed on m-c a while ago
Risk to taking this patch (and alternatives if risky): Very low
String or UUID changes made by this patch: None

Comment 9

[Alex Keybl [:akeybl]]

Comment on attachment 705424 [details] [diff] [review]
Put MFBT first in the VPATH, rev. 1

Tracking and approving on behalf of developers and Linux distros.

Comment 10

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/5bbf98e5690a