Bug 1757813: Detect "MSYS" unames as `msyshost`s r=firefox-build-system-reviewers,nalexander

MozillaBuild 3.4's kernel name was `MINGW32_NT-6.2`, but the new
MozillaBuild's kernel name looks like `MSYS_NT-10.0-19044`.

Update existing first-party detection code to properly handle the modern
MSYS "kernel name" format.

Differential Revision: https://phabricator.services.mozilla.com/D140096
This commit is contained in:
Mitchell Hentges 2022-03-02 21:01:07 +00:00
Родитель 5d2b383d0a
Коммит b48f6cf7dc
8 изменённых файлов: 10 добавлений и 10 удалений

Просмотреть файл

@ -4,7 +4,7 @@ dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
AC_DEFUN([MOZ_PROG_CHECKMSYS],
[AC_REQUIRE([AC_INIT_BINSH])dnl
if test `uname -s | grep -c MINGW 2>/dev/null` != "0"; then
if test `uname -s | grep -c "MINGW\|MSYS" 2>/dev/null` != "0"; then
msyshost=1
fi
])

Просмотреть файл

@ -13,7 +13,7 @@ export ENABLE_CLANG_PLUGIN=1
if [ -n "$UPLOAD_PATH" ]; then
case "$(uname -s)" in
MINGW*)
MINGW*|MSYS*)
DIAGNOSTICS_DIR="$(cmd.exe //e:on //c if not exist ${UPLOAD_PATH} mkdir ${UPLOAD_PATH} && cd ${UPLOAD_PATH} && pwd)"
;;
*)

Просмотреть файл

@ -6,7 +6,7 @@ export TARGET="$1"
COMPRESS_EXT=zst
case "$(uname -s)" in
MINGW*)
MINGW*|MSYS*)
UPLOAD_DIR=$PWD/public/build
. $GECKO_PATH/taskcluster/scripts/misc/vs-setup.sh

Просмотреть файл

@ -8,7 +8,7 @@ export TARGET=$1
COMPRESS_EXT=zst
# This script is for building dump_syms
case "$(uname -s)" in
MINGW*)
MINGW*|MSYS*)
UPLOAD_DIR=$PWD/public/build
. $GECKO_PATH/taskcluster/scripts/misc/vs-setup.sh
@ -53,7 +53,7 @@ Linux)
;;
esac
;;
MINGW*)
MINGW*|MSYS*)
cargo build --verbose --release
;;
esac

Просмотреть файл

@ -16,7 +16,7 @@ Linux)
export PATH="$MOZ_FETCHES_DIR/clang/bin:$MOZ_FETCHES_DIR/binutils/bin:$PATH"
;;
MINGW*)
MINGW*|MSYS*)
UPLOAD_DIR=$PWD/public/build
. $GECKO_PATH/taskcluster/scripts/misc/vs-setup.sh

Просмотреть файл

@ -8,7 +8,7 @@ COMPRESS_EXT=zst
case "$(uname -s)" in
Linux)
;;
MINGW*)
MINGW*|MSYS*)
UPLOAD_DIR=$PWD/public/build
. $GECKO_PATH/taskcluster/scripts/misc/vs-setup.sh

Просмотреть файл

@ -11,7 +11,7 @@ case "$(uname -s)" in
Linux)
PATH="$MOZ_FETCHES_DIR/binutils/bin:$PATH"
;;
MINGW*)
MINGW*|MSYS*)
UPLOAD_DIR=$PWD/public/build
. $GECKO_PATH/taskcluster/scripts/misc/vs-setup.sh
@ -54,7 +54,7 @@ Linux)
esac
;;
MINGW*)
MINGW*|MSYS*)
cargo build --verbose --release --features="dist-client s3 gcs $COMMON_FEATURES"
;;
esac

Просмотреть файл

@ -1,5 +1,5 @@
case "$(uname -s)" in
MINGW*)
MINGW*|MSYS*)
# For some reason, by the time the task finishes, and when run-task
# starts its cleanup, there is still a vctip.exe (MSVC telemetry-related
# process) running and using a dll that run-task can't then delete.