mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-01 14:45:29 +00:00
dfdf59058d
Some mozconfigs don't include mozconfig.linux*, and don't get gtk-related definitions, so move them in a separate mozconfig. To avoid having two files, one for 32-bit builds and one for 64-bit builds, rely on the includer to set PKG_CONFIG_LIBDIR appropriately. At the same time, move all the --enable-default-toolkit=cairo-gtk2 in that new file in the case the gtk3 package wasn't pulled from tooltool.
38 lines
1.2 KiB
Plaintext
38 lines
1.2 KiB
Plaintext
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}
|
|
MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
|
|
fi
|
|
|
|
. "$topsrcdir/build/mozconfig.common"
|
|
|
|
# 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="$topsrcdir/gcc/bin/gcc"
|
|
CXX="$topsrcdir/gcc/bin/g++"
|
|
|
|
# We want to make sure we use binutils and other binaries in the tooltool
|
|
# package.
|
|
mk_add_options PATH="$topsrcdir/gcc/bin:$PATH"
|
|
else
|
|
CC="/tools/gcc-4.7.3-0moz1/bin/gcc"
|
|
CXX="/tools/gcc-4.7.3-0moz1/bin/g++"
|
|
fi
|
|
|
|
ac_add_options --enable-elf-hack
|
|
|
|
# Avoid dependency on libstdc++ 4.7
|
|
ac_add_options --enable-stdcxx-compat
|
|
|
|
# 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"
|