Bug 1366050 - Build with Stylo for Linux32. r=gps
Now that various Rust bindgen issues are resolved, we can build with Stylo
support on Linux 32-bit.
MozReview-Commit-ID: H1BHxZkOqky
--- a/browser/config/mozconfigs/linux32/common-opt
+++ b/browser/config/mozconfigs/linux32/common-opt
@@ -1,10 +1,12 @@
# This file is sourced by nightly, beta, and release mozconfigs.
+. $topsrcdir/build/mozconfig.stylo
+
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --with-google-api-keyfile=/builds/gapi.data
ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
. $topsrcdir/build/unix/mozconfig.linux32
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
--- a/browser/config/mozconfigs/linux32/debug
+++ b/browser/config/mozconfigs/linux32/debug
@@ -1,12 +1,14 @@
ac_add_options --enable-debug
ac_add_options --enable-dmd
ac_add_options --enable-verify-mar
+. $topsrcdir/build/mozconfig.stylo
+
MOZ_AUTOMATION_L10N_CHECK=0
. $topsrcdir/build/unix/mozconfig.linux32
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
# Enable Telemetry
--- a/browser/config/mozconfigs/linux32/debug-asan
+++ b/browser/config/mozconfigs/linux32/debug-asan
@@ -1,13 +1,15 @@
# Use at least -O1 for optimization to avoid stack space
# exhaustions caused by Clang function inlining.
ac_add_options --enable-debug
ac_add_options --enable-optimize="-O1"
+. $topsrcdir/build/mozconfig.stylo
+
# ASan specific options on Linux
ac_add_options --enable-valgrind
. $topsrcdir/build/unix/mozconfig.asan
export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
--- a/browser/config/mozconfigs/linux32/nightly-asan
+++ b/browser/config/mozconfigs/linux32/nightly-asan
@@ -1,12 +1,14 @@
# We still need to build with debug symbols
ac_add_options --disable-debug
ac_add_options --enable-optimize="-O2 -g"
+. $topsrcdir/build/mozconfig.stylo
+
# ASan specific options on Linux
ac_add_options --enable-valgrind
. $topsrcdir/build/unix/mozconfig.asan
export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -569,21 +569,17 @@ option('--enable-stylo', nargs='?', choi
@depends('--enable-stylo', '--help', target)
def stylo_config(value, _, target):
build_stylo = None
enable_stylo = None
# If nothing is specified, default to building stylo where possible.
if value.origin == 'default':
- if target.os == 'GNU' and target.bitness == 32:
- # The clang setup we use in automation is a little unusual, and
- # doesn't play well with bindgen on 32-bit Linux.
- pass
- elif target.os == 'Android':
+ if target.os == 'Android':
# Stylo on Android is happening Later(tm).
pass
else:
build_stylo = True
elif len(value) and value[0] == 'build':
# Build but disable by request.
build_stylo = True
elif bool(value):