Verified Commit d940f9db authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

Bug 40353: Re-enable rlbox 

Updated the creation of the WASI sysroot, to be more similar to what
Mozilla does in shell scripts included in Firefox source code.
This includes the same hacks, like re-using the LLVM we already build.

We were still using lucetc, which is not needed anymore. Therefore,
this commit removes it.
parent 14ede88c

Makefile

+0 −3
Original line number Diff line number Diff line
@@ -274,9 +274,6 @@ cargo_vendor-cbindgen-android: submodule-update 
cargo_vendor-cbindgen: submodule-update

	$(rbm) build cbindgen --step cargo_vendor --target nightly --target torbrowser-linux-x86_64



cargo_vendor-lucetc: submodule-update

	$(rbm) build lucetc --step cargo_vendor --target nightly --target torbrowser-linux-x86_64



cargo_vendor-uniffi-rs: submodule-update

	$(rbm) build uniffi-rs --step cargo_vendor --target nightly --target torbrowser-linux-x86_64

projects/clang/build

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ cd build 
cmake ../llvm -GNinja \

              -DCMAKE_INSTALL_PREFIX=$distdir \

              -DCMAKE_BUILD_TYPE=Release \

              -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64[% IF c("var/rlbox") -%];WebAssembly[% END %]" \

              -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64;WebAssembly" \

              -DLLVM_ENABLE_PROJECTS="clang;lld" \

              -DLLVM_ENABLE_ZLIB=ON \

              -DLLVM_INSTALL_UTILS=ON \

projects/firefox/build

+1 −4
Original line number Diff line number Diff line
@@ -49,10 +49,7 @@ export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bi 
    rtdir=/var/tmp/dist/clang/lib/clang/[% pc("clang", "version") %]/lib/wasi

  [% END -%]

  mkdir -p $rtdir

  cp /var/tmp/dist/wasi-sysroot/lib/clang/11.0.0/lib/wasi/libclang_rt.builtins-wasm32.a $rtdir

  tar -C /var/tmp/dist -xf [% c('input_files_by_name/lucetc') %]

  export PATH="/var/tmp/dist/lucetc/bin:$PATH"

  export WASM_SANDBOXED_LIBRARIES=graphite,ogg

  cp /var/tmp/dist/wasi-sysroot/lib/clang/*/lib/wasi/libclang_rt.builtins-wasm32.a $rtdir

  export WASI_SYSROOT=/var/tmp/dist/wasi-sysroot/share/wasi-sysroot

[% END -%]

projects/firefox/config

+0 −3
Original line number Diff line number Diff line
@@ -158,9 +158,6 @@ input_files: 
  - project: wasi-sysroot

    name: wasi-sysroot

    enable: '[% c("var/rlbox") %]'

  - project: lucetc

    name: lucetc

    enable: '[% c("var/rlbox") %]'

  - project: node

    name: node

  - project: nasm

projects/firefox/list_toolchain_updates_checks

+0 −10
Original line number Diff line number Diff line
@@ -213,15 +213,5 @@ needed=$(perl -MYAML::XS -e "$p") 
current='[% pc("wasi-sysroot", "git_hash") %]'

check_update_needed wasi-sdk "$needed" "$current"





# lucetc

read -d '' p << 'EOF' || true

my $d = YAML::XS::LoadFile('taskcluster/ci/fetch/toolchains.yml');

print $d->{'lucetc-source'}{fetch}{revision};

EOF

needed=$(perl -MYAML::XS -e "$p")

current='[% pc("lucetc", "git_hash") %]'

check_update_needed lucetc "$needed" "$current"



# End RLBox

[% END -%]