From c0a693644c22fdb1a13b2e436fd0f5941a746aa4 Mon Sep 17 00:00:00 2001 From: ur4t <46435411+ur4t@users.noreply.github.com> Date: Sat, 30 Mar 2024 13:33:01 +0800 Subject: [PATCH 1/2] Add constant AT_MINSIGSTKSZ introduced by glibc 2.35 --- libc-test/semver/linux.txt | 1 + src/unix/linux_like/linux/mod.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/libc-test/semver/linux.txt b/libc-test/semver/linux.txt index 0ac88784343d..123f8dab404e 100644 --- a/libc-test/semver/linux.txt +++ b/libc-test/semver/linux.txt @@ -169,6 +169,7 @@ AT_GID AT_HWCAP AT_HWCAP2 AT_IGNORE +AT_MINSIGSTKSZ AT_NOTELF AT_NO_AUTOMOUNT AT_NULL diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs index e8fb33d2c40d..ee2999861f5c 100644 --- a/src/unix/linux_like/linux/mod.rs +++ b/src/unix/linux_like/linux/mod.rs @@ -1821,6 +1821,7 @@ pub const AT_EXECFN: ::c_ulong = 31; // defined in arch//include/uapi/asm/auxvec.h but has the same value // wherever it is defined. pub const AT_SYSINFO_EHDR: ::c_ulong = 33; +pub const AT_MINSIGSTKSZ: ::c_ulong = 51; pub const GLOB_ERR: ::c_int = 1 << 0; pub const GLOB_MARK: ::c_int = 1 << 1; From 82206836f7b61cbf5a4522da02cce54123807e7d Mon Sep 17 00:00:00 2001 From: ur4t <46435411+ur4t@users.noreply.github.com> Date: Sat, 30 Mar 2024 14:08:05 +0800 Subject: [PATCH 2/2] Double quote variables in shell scripts --- ci/install-rust.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/install-rust.sh b/ci/install-rust.sh index d7e2be8070dc..d7a035af2168 100644 --- a/ci/install-rust.sh +++ b/ci/install-rust.sh @@ -13,12 +13,12 @@ fi if [ "$OS" = "windows" ]; then : "${TARGET?The TARGET environment variable must be set.}" rustup set profile minimal - rustup update --force $toolchain-"$TARGET" - rustup default $toolchain-"$TARGET" + rustup update --force "$toolchain-$TARGET" + rustup default "$toolchain-$TARGET" else rustup set profile minimal - rustup update --force $toolchain - rustup default $toolchain + rustup update --force "$toolchain" + rustup default "$toolchain" fi if [ -n "$TARGET" ]; then