From 3d012a08d09d0d6e84532d85297044a98816aa1b Mon Sep 17 00:00:00 2001
From: Corentin Le Molgat <corentinl@google.com>
Date: Thu, 21 Nov 2024 16:45:20 +0100
Subject: [PATCH] cmake(ci): fix toolchain and web sh_* rules

---
 cmake/Makefile              | 4 ++--
 cmake/docker/web/Dockerfile | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/Makefile b/cmake/Makefile
index d985ec0be8..948fc01f03 100644
--- a/cmake/Makefile
+++ b/cmake/Makefile
@@ -658,7 +658,7 @@ cache/%/docker_$1.tar: %_$1
 sh_targets_toolchain_$1 = $(addprefix sh_toolchain_, $(addsuffix _$1, $(TOOLCHAIN_TARGETS)))
 .PHONY: $$(sh_targets_toolchain_$1)
 $$(sh_targets_toolchain_$1): sh_toolchain_%_$1: %_$1
-	${DOCKER_RUN_CMD} -it --name ${IMAGE}_toolchain_$$*_$1 ${IMAGE}:toolchain_$$*_$1
+	${DOCKER_RUN_CMD} -it --name ${PROJECT}_toolchain_$$*_$1 ${IMAGE}:toolchain_$$*_$1
 
 #$$(info Create targets: clean_toolchain_$1 $(addprefix clean_toolchain_, $(addsuffix _$1, $(TOOLCHAIN_TARGETS))).)
 clean_targets_toolchain_$1 = $(addprefix clean_toolchain_, $(addsuffix _$1, $(TOOLCHAIN_TARGETS)))
@@ -700,7 +700,7 @@ cache/web/docker_$1.tar: web_$1
 #$$(info Create target: sh_web_$1 (debug).)
 .PHONY: sh_web_$1
 sh_web_$1: web_$1
-	${DOCKER_RUN_CMD} -it --name ${IMAGE}_web_$1 ${IMAGE}:web_$1
+	${DOCKER_RUN_CMD} -it --name ${PROJECT}_web_$1 ${IMAGE}:web_$1
 
 #$$(info Create target: clean_web_$1.)
 .PHONY: clean_web_$1
diff --git a/cmake/docker/web/Dockerfile b/cmake/docker/web/Dockerfile
index 1ebec3a45c..1dcefb864f 100644
--- a/cmake/docker/web/Dockerfile
+++ b/cmake/docker/web/Dockerfile
@@ -4,7 +4,7 @@ FROM archlinux:latest AS env
 
 # Install system build dependencies
 ENV PATH=/usr/local/bin:$PATH
-RUN pacman -Syu --noconfirm git base-devel cmake
+RUN pacman -Syu --noconfirm git base-devel glibc cmake
 RUN cmake -version
 RUN pacman -Syu --noconfirm nodejs emscripten
 ENV PATH=/usr/lib/emscripten:$PATH