wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1244261 - part 2 - use common mozconfig.rust on OS X; r=mshal

Browse Source 
Now that we have cross-compilation tooltool packages for OS X, we can
use the common mozconfig to enable Rust on all OS X builds, regardless
of host OS.
This commit is contained in:
Nathan Froyd 2016-02-01 10:20:57 -05:00
parent 2d67c232c6
commit 65efbb3241
6 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/config/mozconfigs/macosx-universal/nightly
View File

@ -12,6 +12,6 @@ fi
ac_add_options --with-branding=browser/branding/nightly ac_add_options --with-branding=browser/branding/nightly
. "$topsrcdir/build/macosx/mozconfig.rust" . "$topsrcdir/build/mozconfig.rust"
. "$topsrcdir/build/mozconfig.common.override" . "$topsrcdir/build/mozconfig.common.override"
. "$topsrcdir/build/mozconfig.cache" . "$topsrcdir/build/mozconfig.cache"

2
browser/config/mozconfigs/macosx64/debug
View File

@ -20,6 +20,6 @@ export MOZ_PACKAGE_JSSHELL=1
ac_add_options --with-branding=browser/branding/nightly ac_add_options --with-branding=browser/branding/nightly
. "$topsrcdir/build/macosx/mozconfig.rust" . "$topsrcdir/build/mozconfig.rust"
. "$topsrcdir/build/mozconfig.common.override" . "$topsrcdir/build/mozconfig.common.override"
. "$topsrcdir/build/mozconfig.cache" . "$topsrcdir/build/mozconfig.cache"

2
browser/config/mozconfigs/macosx64/nightly
View File

@ -18,6 +18,6 @@ export MOZ_PACKAGE_JSSHELL=1
ac_add_options --with-branding=browser/branding/nightly ac_add_options --with-branding=browser/branding/nightly
. "$topsrcdir/build/macosx/mozconfig.rust" . "$topsrcdir/build/mozconfig.rust"
. "$topsrcdir/build/mozconfig.common.override" . "$topsrcdir/build/mozconfig.common.override"
. "$topsrcdir/build/mozconfig.cache" . "$topsrcdir/build/mozconfig.cache"

2
browser/config/mozconfigs/macosx64/opt-static-analysis
View File

@ -13,7 +13,7 @@ ac_add_options --enable-warnings-as-errors
ac_add_options --enable-clang-plugin ac_add_options --enable-clang-plugin
. "$topsrcdir/build/macosx/mozconfig.rust" . "$topsrcdir/build/mozconfig.rust"
. "$topsrcdir/build/mozconfig.common.override" . "$topsrcdir/build/mozconfig.common.override"
. "$topsrcdir/build/mozconfig.cache" . "$topsrcdir/build/mozconfig.cache"

2
browser/config/mozconfigs/whitelist
View File

@ -53,7 +53,7 @@ whitelist['nightly']['macosx-universal'] += [
'ac_add_options --disable-install-strip', 'ac_add_options --disable-install-strip',
'ac_add_options --enable-instruments', 'ac_add_options --enable-instruments',
'ac_add_options --enable-dtrace', 'ac_add_options --enable-dtrace',
'. "$topsrcdir/build/macosx/mozconfig.rust"', '. "$topsrcdir/build/mozconfig.rust"',
] ]
whitelist['nightly']['win32'] += [ whitelist['nightly']['win32'] += [

6
build/macosx/mozconfig.rust
View File

@ -1,6 +0,0 @@
# Options to enable rust in automation builds.
if test `uname -s` != Linux; then
RUSTC="$topsrcdir/rustc/bin/rustc"
ac_add_options --enable-rust
fi