зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1375271 - Add an explicit --target to osx l10n mozconfigs. r=catlee
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. --HG-- extra : rebase_source : 79d1616f0cc8291fbc3432165891fdfe8f221f95
This commit is contained in:
Родитель
aa2e0787df
Коммит
a30f1505c7
|
@ -1,6 +1,9 @@
|
||||||
. "$topsrcdir/browser/config/mozconfigs/common"
|
. "$topsrcdir/browser/config/mozconfigs/common"
|
||||||
. "$topsrcdir/build/mozconfig.no-compile"
|
. "$topsrcdir/build/mozconfig.no-compile"
|
||||||
|
|
||||||
|
# We need to indicate the target for cross builds
|
||||||
|
ac_add_options --target=x86_64-apple-darwin
|
||||||
|
|
||||||
ac_add_options --with-l10n-base=../../l10n
|
ac_add_options --with-l10n-base=../../l10n
|
||||||
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
|
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
|
||||||
ac_add_options --with-branding=browser/branding/nightly
|
ac_add_options --with-branding=browser/branding/nightly
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
. "$topsrcdir/browser/config/mozconfigs/common"
|
. "$topsrcdir/browser/config/mozconfigs/common"
|
||||||
. "$topsrcdir/build/mozconfig.no-compile"
|
. "$topsrcdir/build/mozconfig.no-compile"
|
||||||
|
|
||||||
|
# We need to indicate the target for cross builds
|
||||||
|
ac_add_options --target=x86_64-apple-darwin
|
||||||
|
|
||||||
ac_add_options --with-l10n-base=../../l10n
|
ac_add_options --with-l10n-base=../../l10n
|
||||||
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
|
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
|
||||||
ac_add_options --with-branding=browser/branding/aurora
|
ac_add_options --with-branding=browser/branding/aurora
|
||||||
|
|
Загрузка…
Ссылка в новой задаче