Closed Bug 1399877 Opened 3 years ago Closed 2 years ago

Globally define DLL_PREFIX/DLL_SUFFIX

Categories

(Firefox Build System :: General, enhancement)

enhancement
Not set
normal

Tracking

(firefox57 wontfix, firefox64 fixed)

RESOLVED FIXED
mozilla64
Tracking Status
firefox57 --- wontfix
firefox64 --- fixed

People

(Reporter: ted, Assigned: ted)

References

Details

Attachments

(1 file, 1 obsolete file)

We use these defines in a handful of source files in the tree, but each of them sets the `DEFINES` locally in moz.build:
https://dxr.mozilla.org/mozilla-central/search?q=DLL_PREFIX+path%3Amoz.build&redirect=true

We also have a globally-defined `MOZ_DLL_SUFFIX`:
https://dxr.mozilla.org/mozilla-central/rev/f9a5e9ed62103c84e4cde915f4d08f1ce71be83e/moz.configure#223

which is used in all of one source file:
https://dxr.mozilla.org/mozilla-central/rev/f9a5e9ed62103c84e4cde915f4d08f1ce71be83e/xpcom/build/nsXPCOMPrivate.h#84

The locally-set DEFINEs are a problem in the WSL build because the quoting gets lost going from bash to cl.exe. Setting them globally with `set_define` works fine, so we might as well just do that.
Comment on attachment 8908141 [details]
bug 1399877 - Globally define DLL_PREFIX/DLL_SUFFIX.

https://reviewboard.mozilla.org/r/179824/#review185568

I wish we didn't have to put this in DEFINES. But that would be follow-up fodder.

Nice cleanup.
Attachment #8908141 - Flags: review?(gps) → review+
Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/d9bc6c96c492
Globally define DLL_PREFIX/DLL_SUFFIX. r=gps
Actually, looks like all or most of the android tests are timing out.
I think I will rework this patch to use MOZ_DLL_{PREFIX,SUFFIX} everywhere, which should avoid the conflict with the defines used by package-manifest.in.
Flags: needinfo?(ted)
Product: Core → Firefox Build System
This version reworks things--I believe--according to the plan Ted mentioned in
comment 10.  I'm going to carry over gps's review from the previous patch, and
assuming try comes back green, land it.
Attachment #9008096 - Flags: review+
Attachment #8908141 - Attachment is obsolete: true
Pushed by nfroyd@mozilla.com:
https://hg.mozilla.org/integration/mozilla-inbound/rev/e186d8665b00
globally define MOZ_DLL_PREFIX/MOZ_DLL_SUFFIX; r=gps
https://hg.mozilla.org/mozilla-central/rev/e186d8665b00
Status: NEW → RESOLVED
Closed: 2 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla64
You need to log in before you can comment on or make changes to this bug.