Our makefile rules for wrapping system/stl headers is rather large: http://mxr.mozilla.org/mozilla-central/source/config/Makefile.in#63 We should just have something like: WRAPPED_SYSTEM_INCLUDES += ['system-headers'] WRAPPED_STL_INCLUDES += ['stl-headers'] and let moz.build generate the appropriate rules, or do the generating itself, or whatever. Bonus: - we don't have to use make-system-wrappers.pl from NSPR anymore - we don't have to generate the headers in a temporary directory; we can generate them directly into dist/include/

I'd say we don't need this in moz.build at all, we could just call a python script to generate it from configure. The only thing that might be weird is generating the rules to rebuild if the deps change, but I don't think it's that complicated.

I didn't know if we had to care about PGO builds still blowing away dist/. If we don't, then just generating it at configure time would be sufficient and better.