Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1489001 - Move most of mozconfig.linux to mozconfig.unix. r=froydnj

Browse Source 
Bug 1487330 made mozconfig.asan use mozconfig.linux, but while that
worked out fine, it turns out that we do have mac builds using
e.g. mozconfig.asan, and that those can break when doing linux-specific
changes to mozconfig.linux.


--HG--
rename : build/unix/mozconfig.linux => build/unix/mozconfig.unix
This commit is contained in:
Mike Hommey 2018-09-06 11:43:08 +09:00
parent 73bcb55c27
commit a5cbd7bc7e
4 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/unix/mozconfig.asan
View File

@ -1,6 +1,6 @@
MOZ_AUTOMATION_L10N_CHECK=0
. "$topsrcdir/build/unix/mozconfig.linux"
. "$topsrcdir/build/unix/mozconfig.unix"
export LLVM_SYMBOLIZER="$topsrcdir/clang/bin/llvm-symbolizer"
#

26
build/unix/mozconfig.linux
View File

@ -1,25 +1 @@
if [ "x$IS_NIGHTLY" = "xyes" ]; then
# Some nightlies (eg: Mulet) don't want these set.
MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
fi
. "$topsrcdir/build/mozconfig.common"
TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
if [ -n "$FORCE_GCC" -o -n "$MOZ_PGO" ]; 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 "export PATH=$TOOLTOOL_DIR/gcc/bin:$PATH"
else
CC="$TOOLTOOL_DIR/clang/bin/clang"
CXX="$TOOLTOOL_DIR/clang/bin/clang++"
export ENABLE_CLANG_PLUGIN=1
mk_add_options "export PATH=$TOOLTOOL_DIR/binutils/bin:$PATH"
fi
. "$topsrcdir/build/unix/mozconfig.stdcxx"
. "$topsrcdir/build/unix/mozconfig.unix"

2
build/unix/mozconfig.tsan
View File

@ -1,6 +1,6 @@
MOZ_AUTOMATION_L10N_CHECK=0
. "$topsrcdir/build/unix/mozconfig.linux"
. "$topsrcdir/build/unix/mozconfig.unix"
export LLVM_SYMBOLIZER="$topsrcdir/clang/bin/llvm-symbolizer"

25
build/unix/mozconfig.unix Normal file
View File

@ -0,0 +1,25 @@
if [ "x$IS_NIGHTLY" = "xyes" ]; then
# Some nightlies (eg: Mulet) don't want these set.
MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
fi
. "$topsrcdir/build/mozconfig.common"
TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
if [ -n "$FORCE_GCC" -o -n "$MOZ_PGO" ]; 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 "export PATH=$TOOLTOOL_DIR/gcc/bin:$PATH"
else
CC="$TOOLTOOL_DIR/clang/bin/clang"
CXX="$TOOLTOOL_DIR/clang/bin/clang++"
export ENABLE_CLANG_PLUGIN=1
mk_add_options "export PATH=$TOOLTOOL_DIR/binutils/bin:$PATH"
fi
. "$topsrcdir/build/unix/mozconfig.stdcxx"