1641791 - Drop special l10n-merge fallback from LANGPACK_DEFINES

Status: RESOLVED FIXED

(Firefox Build System :: General, task)

Description

[Axel Hecht [:Pike]]

Follow-up bug to bug 1641184, there's a special special fallback chain for defines.inc that I missed. What a special unicorn.

Historic background, doing the fallback logic for defines.inc was harder than for others, so (probably) I tried to make sure we're not reading it from the merge dir, if we got one there by chance.

Today, it's just there, in its right shape and form.

Comment 1

[Axel Hecht [:Pike]]

Attachment: Bug 1641791, remove special build fallback for LANGPACK_DEFINES, r=#build

This is a follow-up to bug 1641184, which I missed due to the special
special logic for defines.inc here.

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/dcd6c6877bba
remove special build fallback for LANGPACK_DEFINES, r=nalexander

Comment 3

[Cristina Coroiu [:ccoroiu]]

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

Comment 4

[mac198442]

This change has broken Thunderbird builds.

Comment 5

[mac198442]

(In reply to mac198442 from comment #4)

This change has broken Thunderbird builds.

See bug 1642092

Comment 6

[mac198442]

I think this code (or perhaps replaced bysomething less kludgy looking) including a comment explaining it is required for comm-central builds.

Comment 7

[mac198442]

OK tried to say.

I think this code should be backed out (or perhaps replaced by something less kludgy looking) including a comment explaining it is required for comm-central builds.

Comment 8

[mac198442]

Attachment: comm-central bustage fix

This fixes the Thunderbird and SeaMonkey build issues.

Comment 9

[Axel Hecht [:Pike]]

Comment on attachment 9152960 [details] [diff] [review]
comm-central bustage fix

This won't work, see bug 1642092 for an actual fix.