Before bug 1373150, the l10n mozconfigs would include
compilation-related mozconfigs, which include setting compiler paths,
and setting --target for cross builds. After bug 1373150, the
compilation-related mozconfigs are not included anymore, which made
--target unset for l10n builds, leaving it to configure to guess what it
is based on the host. Which for cross builds is Linux, so configure
would set things up for a linux build, which doesn't work to do osx
l10n repacks.
So we add back an explicit --target to those mozconfigs, without
including all the compilation-related things.
We set the target to x86_64-apple-darwin, which is the same as what was
set through build/macosx/cross-mozconfig.common. This is different from
what the native osx builds would get (x86_64-apple-darwin11.2.0), but
the extra version in that target is actually not relevant and native
builds shouldn't care that it's gone.
The universal l10n-mozconfig includes build/macosx/mozconfig.common,
which sets up CC/CXX to point to the tooltool version of clang. We need
the tooltool version in order to build with the newer compiler features
that we use.
The additional changes to the mozconfig are done to make the macosx64
version match what we had in macosx-universal.
MozReview-Commit-ID: AnjuC904vqH
--HG--
extra : rebase_source : 71bea472621901498ad55490d2126568f54abe4d
Needed because buildbot clones/checks out from the repo head (of default)
and then updates to the rev for the nightly we're pulling, which can cause
CLOBBER file changes to initiate an unwanted clobber of the object directory
where we just pulled the nightly binary from. Even when CLOBBER hasn't actually
been touched in the changeset range we're looking at between nightlies.
MozReview-Commit-ID: 154d2iZeHgd
--HG--
extra : rebase_source : 504b821955a870cabf6fc727d13e44a33aabb45c
Removes options that are now set by default (eg enable symbols, app=browser) and
those that have since been removed from configure (eg --disable-javaxpcom). Also
removes |--enable-jemalloc| if |--enable-trace-malloc| present, since the latter
force disables jemalloc regardless.
Note: This changeset is effectively no-op. No behaviour change is intended.
Mike Hommey
Dan Mosedale
Sylvestre Ledru
Dorel Luca
Cosmin Sabou
Rail Aliiev
Mike Shal
Justin Wood
Chris Cooper
Chris AtLee
Steve Fink
John Ford
Ed Morley