One more file to convert: mfbt/exported_headers.mk EXPORTS_NAMESPACES += mozilla EXPORTS_mozilla += \ Assertions.h \ [ ... ]

This is blocking me from nuking EXPORTS_NAMESPACES from rules.mk in bug 890097. I'll take this one real quick.

Hmm. The file in question is included in the JS build system to facilitate standalone JS builds. Unfortunately, the moz.build reader has smarts preventing include() from working on files outside of the top source directory. Since it needs to do a |include('../../mfbt/<path>')|, it's failing. Hmmm.

(In reply to Gregory Szorc [:gps] from comment #2) > Hmm. The file in question is included in the JS build system to facilitate > standalone JS builds. Unfortunately, the moz.build reader has smarts > preventing include() from working on files outside of the top source > directory. Since it needs to do a |include('../../mfbt/<path>')|, it's > failing. Hmmm. Maybe some --with-external-source-dir= magic would help?

Returning to the pool.

I figured I could take a stab at this. js/src/configure.in just sets EXTERNAL_SOURCE_DIR to a hardcoded path, so you don't need to remember to specify it in standalone spidermonkey builds. It was hardcoded in js/src/Makefile.in anyway, so it's not any worse off, really. I figured I'd do the sources as well, while I was touching things, since it was basically the same change. When I moved the js/src/Makefile.in bits to moz.build, I had to make some minor changes: - The headers are under JS_STANDALONE now, because otherwise mozbuild was unhappy that files were getting exported twice. - I switched the sources from MOZ_GLUE_PROGRAM_LDFLAGS to JS_STANDALONE, since the former was empty in the standalone and subset-of-firefox builds, and the comment suggests that it only applies in the standalone case. Try was happy: https://tbpl.mozilla.org/?tree=Try&rev=ed6e5121ac2f

Comment on attachment 824087 [details] [diff] [review] fix-mfbt-exports.patch This looks good! Only suggestion I have is it may make sense to combine sources.mozbuild and exported_headers.mozbuild into a single file - I don't think it buys us anything to keep them separate. Up to you though!

(In reply to Michael Shal [:mshal] from comment #7) > Comment on attachment 824087 [details] [diff] [review] > fix-mfbt-exports.patch > > This looks good! Only suggestion I have is it may make sense to combine > sources.mozbuild and exported_headers.mozbuild into a single file - I don't > think it buys us anything to keep them separate. Up to you though! I was thinking the same thing. I moved the IMPL_MFBT define in there as well. I didn't run this through try, but I did check that it still builds locally.

Comment on attachment 825021 [details] [diff] [review] Fix up MFBT exports/sources Looks good!