mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-12 22:28:59 +02:00
9ec14dddcb
--enable-elf-hack is the default on all platforms where it's supported, and is completely ignored on platforms where it's not supported. While moving the flag to moz.configure, we're going to make it only work on platforms where elfhack is supported, so we at least need to remove it from mozconfigs for those platforms where it's not supported. But generally speaking, we want less things in mozconfigs, so just remove it from there, since it's the default anyways.
35 lines
1.1 KiB
Text
35 lines
1.1 KiB
Text
if [ "x$IS_NIGHTLY" = "xyes" ]; then
|
|
# Some nightlies (eg: Mulet) don't want these set.
|
|
MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
|
|
MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
|
|
fi
|
|
|
|
. "$topsrcdir/build/mozconfig.common"
|
|
|
|
TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
|
|
|
|
# some b2g desktop builds still happen on i686 machines, and the tooltool
|
|
# toolchain is x86_64 only.
|
|
# We also deal with valgrind builds here, they don't use tooltool manifests at
|
|
# all yet.
|
|
if [ -z "$no_tooltool" ]
|
|
then
|
|
CC="$TOOLTOOL_DIR/gcc/bin/gcc"
|
|
CXX="$TOOLTOOL_DIR/gcc/bin/g++"
|
|
|
|
# We want to make sure we use binutils and other binaries in the tooltool
|
|
# package.
|
|
mk_add_options PATH="$TOOLTOOL_DIR/gcc/bin:$PATH"
|
|
else
|
|
CC="/tools/gcc-4.7.3-0moz1/bin/gcc"
|
|
CXX="/tools/gcc-4.7.3-0moz1/bin/g++"
|
|
fi
|
|
|
|
. "$topsrcdir/build/unix/mozconfig.stdcxx"
|
|
|
|
# PKG_CONFIG_LIBDIR is appropriately overridden in mozconfig.linux32
|
|
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
|
|
|
|
export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
|
|
|
|
. "$topsrcdir/build/unix/mozconfig.gtk"
|