From 927656865af033fe6a67248badd184df6b6bae4a Mon Sep 17 00:00:00 2001 From: Alex Allmont Date: Wed, 20 Nov 2024 16:31:36 +0000 Subject: [PATCH] build: conditional vcpkg tools for aarch64 (#148) --- .devcontainer/Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 8a0e1705..a6eb3110 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -35,8 +35,11 @@ RUN pip install \ pytest \ pytest-cov -# FIXME make conditional on arm, s390x, ppc64le and riscv -ENV VCPKG_FORCE_SYSTEM_BINARIES=1 +# Use system tools for vcpkg when building aarch64 (Linux on MacOS) +RUN if [ "$(uname -m)" = "aarch64" ]; then \ + echo "Setting VCPKG_FORCE_SYSTEM_BINARIES for MacOS"; \ + export VCPKG_FORCE_SYSTEM_BINARIES=1; \ + fi # Install vcpkg in checkout location RUN git clone https://github.com/Microsoft/vcpkg.git /tools/vcpkg