From f87c57c409690a9028a8ab874d900f4790432a46 Mon Sep 17 00:00:00 2001 From: Anuraag Agrawal Date: Fri, 16 Dec 2022 17:10:04 +0900 Subject: [PATCH] Fix dist reading --- sdk.Dockerfile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sdk.Dockerfile b/sdk.Dockerfile index 87a5818..3cd5c38 100644 --- a/sdk.Dockerfile +++ b/sdk.Dockerfile @@ -2,6 +2,15 @@ # the wasi-sdk sysroot. The SDK distribution must have first been built, # for example using docker_build.sh +# Extract built SDK archive to copy out the sysroot +FROM ubuntu:22.04 as dist + +ADD dist/wasi-sdk-*.*-linux.tar.gz / + +# Move versioned folder to unversioned to using bash glob to allow +# this file to be independent of major version number. +RUN mv /wasi-sdk-* /wasi-sdk + # Use ubuntu to use official repository with newer cmake packages FROM ubuntu:22.04 @@ -24,7 +33,7 @@ RUN apt-get update && \ apt-get install -y clang-15 lld-15 cmake ninja-build make autoconf autogen automake libtool && \ rm -rf /var/lib/apt/lists/* -ADD dist/wasi-sysroot-*.*.tar.gz / +COPY --from=dist /wasi-sdk/share/wasi-sysroot/ /wasi-sysroot/ # The path to the rt directory contains the LLVM patch version which is not reflected in the LLVM apt repository # or package. To make adding the RT robust to changing patch versions without needing to duplicate the folder # content, we symlink after extracting using a bash glob to resolve the patch version