From e25ed5c3dbe5b143d7541e39187582bcd0e78c1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Thu, 21 Jul 2022 23:45:57 +0200 Subject: [PATCH] remove wasi bootstrap --- assets/linux.Dockerfile | 1 - assets/macos.Dockerfile | 9 --------- 2 files changed, 10 deletions(-) diff --git a/assets/linux.Dockerfile b/assets/linux.Dockerfile index 7dba808..8b6432e 100644 --- a/assets/linux.Dockerfile +++ b/assets/linux.Dockerfile @@ -24,7 +24,6 @@ RUN cd /tmp &&\ tar xf librewolf-$version-$source_release.source.tar.gz &&\ cd librewolf-$version-$source_release &&\ MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser &&\ - (cd /root/.mozbuild && /tmp/librewolf-$version-$source_release/mach artifact toolchain --from-build sysroot-wasm32-wasi) &&\ /root/.cargo/bin/cargo install cbindgen &&\ cd .. &&\ rm -rf librewolf-$version-$source_release librewolf-$version-$source_release.source.tar.gz diff --git a/assets/macos.Dockerfile b/assets/macos.Dockerfile index 91af949..a463aed 100644 --- a/assets/macos.Dockerfile +++ b/assets/macos.Dockerfile @@ -16,15 +16,6 @@ ENV wasi_mainversion 14 # dependencies needed to run ./mach bootstrap RUN apt-get -y update && apt-get -y upgrade && apt-get -y install mercurial python3 python3-dev python3-pip wget build-essential libpython3-dev m4 unzip uuid zip libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdbus-glib-1-dev libdrm-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb rsync -# setup wasi -RUN export target_wasi_location=$HOME/.mozbuild/wrlb/ &&\ - wget -q https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$wasi_mainversion/wasi-sdk-$wasi_fullversion-linux.tar.gz &&\ - tar xf wasi-sdk-$wasi_fullversion-linux.tar.gz &&\ - mkdir -p $target_wasi_location &&\ - rm -rf $target_wasi_location/wasi-sysroot &&\ - cp -r wasi-sdk-$wasi_fullversion/share/wasi-sysroot $target_wasi_location &&\ - rm -f wasi-sdk-*.tar.gz* && rm -rf wasi-sdk-* - # setup osx sdk RUN mkdir -p /osx-cross/MacOSX-SDKs &&\ cd /osx-cross/MacOSX-SDKs &&\