Skip to content

fix(toolchain): build the wasi-libc sysroot on bash 3.2 #1918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WyvernMonarch wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(toolchain): build the wasi-libc sysroot on bash 3.2 #1918

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions toolchain/scripts/patch-wasi-libc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,18 @@ if [ "$MODE" = "apply" ] || [ "$MODE" = "check" ]; then
WASI_LIBC_SRC_DIR="$WORKTREE_DIR"
fi

# Find patch files
# Find patch files. Read the list with a plain `read` loop rather than `mapfile`:
# macOS ships bash 3.2, where `mapfile` does not exist and the sysroot build dies
# with "mapfile: command not found".
if [ "$MODE" = "reverse" ]; then
mapfile -t PATCH_FILES < <(find "$PATCHES_DIR" -name '*.patch' -type f 2>/dev/null | sort -r)
list_patch_files() { find "$PATCHES_DIR" -name '*.patch' -type f 2>/dev/null | sort -r; }
else
mapfile -t PATCH_FILES < <(find "$PATCHES_DIR" -name '*.patch' -type f 2>/dev/null | sort)
list_patch_files() { find "$PATCHES_DIR" -name '*.patch' -type f 2>/dev/null | sort; }
fi
PATCH_FILES=()
while IFS= read -r patch_file; do
[ -n "$patch_file" ] && PATCH_FILES+=("$patch_file")
done < <(list_patch_files)

if [ "${#PATCH_FILES[@]}" -eq 0 ]; then
echo "No patch files found in $PATCHES_DIR"
Expand Down