Open Bug 1256608 Opened 9 years ago Updated 2 years ago

Rewrite replace_malloc.mk as an included .mozbuild file

Categories

(Firefox Build System :: General, defect)

defect

Tracking

(Not tracked)

People

(Reporter: ted, Unassigned)

References

(Blocks 1 open bug)

Details

Attachments

(2 files)

This .mk file: https://dxr.mozilla.org/mozilla-central/rev/d6ee82b9a74155b6bfd544166f036fc572ae8c56/mozglue/build/replace_malloc.mk Gets included from two Makefile.in files: https://dxr.mozilla.org/mozilla-central/rev/d6ee82b9a74155b6bfd544166f036fc572ae8c56/memory/replace/logalloc/replay/Makefile.in#5 https://dxr.mozilla.org/mozilla-central/rev/d6ee82b9a74155b6bfd544166f036fc572ae8c56/mozglue/build/Makefile.in#16 It's not doing anything incredibly complicated, that could be ported to a .mozbuild file that sets LDFLAGS pretty trivially. There is one kind-of-gross line: ``` OS_LDFLAGS += -Wl,-weak_library,$(DEPTH)/memory/replace/dummy/$(DLL_PREFIX)dummy_replace_malloc$(DLL_SUFFIX) ``` Which maybe we could just move to a moz.configure file and use via a subst?
This has changed in the last while, these days it reads "memory/build/malloc_decls.h" and adds "-U" to LDFLAGS for each MALLOC_DECL. The to achieve this currently will be to generate this value in moz.configure and then append to LDFLAGS in moz.build. The possibly obnoxious downside here will be some changes to malloc_decls.h requiring configure to be re-run.
Assignee: nobody → cmanchester
This is the straightforward patch, which works fine. How problematic the configure dependency is depends on how much malloc_decls.h ends up getting changed -- glandium can probably make a call there.
How hold up are you on this? AIUI, your most immediate goal is for things to work for linux builds, and that file is irrelevant for linux builds. OTOH, in the relatively short term, those flags won't require to read malloc_decls.h. So I'm not too thrilled adding this complexity temporarily.
We could probably just shunt things like this off to a separate variable to be handled by Make alone for now if this is going to disappear anyway in the relatively short term.
Assignee: cmanchester → nobody
Attachment #8922149 - Flags: review?(mh+mozilla)
Attachment #8922150 - Flags: review?(mh+mozilla)
(In reply to Mike Hommey [:glandium] from comment #5) > OTOH, in the relatively short term, those flags won't require to read malloc_decls.h. I'm probably going to work on that within the next 2 to 3 weeks, FWIW.
Product: Core → Firefox Build System
Severity: normal → S3
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: