8 files changed, 119 insertions, 0 deletions
diff --git a/config/mozconfigs/linux64/beta b/config/mozconfigs/linux64/beta
new file mode 100644
index 0000000..7c05460
--- /dev/null
+++ b/config/mozconfigs/linux64/beta
@@ -0,0 +1,7 @@
+. "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
+
+ac_add_options --enable-official-branding
+
+mk_add_options MOZ_PGO=1
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/config/mozconfigs/linux64/common-opt b/config/mozconfigs/linux64/common-opt
new file mode 100644
index 0000000..c448460
--- /dev/null
+++ b/config/mozconfigs/linux64/common-opt
@@ -0,0 +1,19 @@
+# This file is sourced by the nightly, beta, and release mozconfigs.
+
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+ac_add_options --with-google-api-keyfile=/builds/gapi.data
+
+. $topsrcdir/build/unix/mozconfig.linux
+
+# Avoid dependency on libstdc++ 4.5
+ac_add_options --enable-stdcxx-compat
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
diff --git a/config/mozconfigs/linux64/debug b/config/mozconfigs/linux64/debug
new file mode 100644
index 0000000..c917660
--- /dev/null
+++ b/config/mozconfigs/linux64/debug
@@ -0,0 +1,22 @@
+ac_add_options --enable-debug
+ac_add_options --enable-trace-malloc
+ac_add_options --enable-signmar
+
+. $topsrcdir/build/unix/mozconfig.linux
+
+# Avoid dependency on libstdc++ 4.5
+ac_add_options --enable-stdcxx-compat
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Use ccache
+ac_add_options --with-ccache=/usr/bin/ccache
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/config/mozconfigs/linux64/debug-asan b/config/mozconfigs/linux64/debug-asan
new file mode 100644
index 0000000..4766ce2
--- /dev/null
+++ b/config/mozconfigs/linux64/debug-asan
@@ -0,0 +1,20 @@
+# 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"
+
+# ASan specific options on Linux
+ac_add_options --enable-valgrind
+
+. $topsrcdir/build/unix/mozconfig.asan
+
+# Avoid dependency on libstdc++ 4.5
+ac_add_options --enable-stdcxx-compat
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
+
+# Need this to prevent name conflicts with the normal nightly build packages
+export MOZ_PKG_SPECIAL=asan
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/config/mozconfigs/linux64/debug-static-analysis-clang b/config/mozconfigs/linux64/debug-static-analysis-clang
new file mode 100644
index 0000000..214d156
--- /dev/null
+++ b/config/mozconfigs/linux64/debug-static-analysis-clang
@@ -0,0 +1,15 @@
+. "$topsrcdir/build/mozconfig.common"
+
+ac_add_options --enable-debug
+
+# Use Clang as specified in manifest
+export CC="$topsrcdir/clang/bin/clang"
+export CXX="$topsrcdir/clang/bin/clang++"
+
+# Add the static checker
+ac_add_options --enable-clang-plugin
+
+# Avoid dependency on libstdc++ 4.5
+ac_add_options --enable-stdcxx-compat
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/config/mozconfigs/linux64/l10n-mozconfig b/config/mozconfigs/linux64/l10n-mozconfig
new file mode 100644
index 0000000..52470c5
--- /dev/null
+++ b/config/mozconfigs/linux64/l10n-mozconfig
@@ -0,0 +1,12 @@
+ac_add_options --with-l10n-base=../../l10n
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+
+# Avoid dependency on libstdc++ 4.5
+ac_add_options --enable-stdcxx-compat
+
+. $topsrcdir/build/unix/mozconfig.linux
+
+export MOZILLA_OFFICIAL=1
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/config/mozconfigs/linux64/release b/config/mozconfigs/linux64/release
new file mode 100644
index 0000000..e52f33f
--- /dev/null
+++ b/config/mozconfigs/linux64/release
@@ -0,0 +1,13 @@
+# This make file should be identical to the beta mozconfig, apart from the
+# safeguard below
+. "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
+
+ac_add_options --enable-official-branding
+
+mk_add_options MOZ_PGO=1
+
+# safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
+# defines.sh during the beta cycle
+export BUILDING_RELEASE=1
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/config/mozconfigs/linux64/valgrind b/config/mozconfigs/linux64/valgrind
new file mode 100644
index 0000000..ccf8971
--- /dev/null
+++ b/config/mozconfigs/linux64/valgrind
@@ -0,0 +1,11 @@
+. $topsrcdir/browser/config/mozconfigs/linux64/nightly
+
+ac_add_options --enable-valgrind
+ac_add_options --disable-jemalloc
+ac_add_options --disable-elf-hack
+ac_add_options --enable-optimize="-g -O -freorder-blocks"
+ac_add_options --disable-install-strip
+
+# Include the override mozconfig again (even though the above includes it)
+# since it's supposed to override everything.
+. "$topsrcdir/build/mozconfig.common.override"