Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
-
d940f9db
by Pier Angelo Vendrame at 2023-01-19T15:18:08+01:00
17 changed files:
- Makefile
- projects/clang/build
- projects/firefox/build
- projects/firefox/config
- projects/firefox/list_toolchain_updates_checks
- projects/geckoview/build
- projects/geckoview/config
- − projects/lucetc/Remove-march-native-from-COMMON_CFLAGS.patch
- − projects/lucetc/build
- − projects/lucetc/config
- + projects/wasi-config/build
- + projects/wasi-config/config
- + projects/wasi-libc/build
- + projects/wasi-libc/config
- projects/wasi-sysroot/build
- projects/wasi-sysroot/config
- rbm.conf
Changes:
... | ... | @@ -274,9 +274,6 @@ cargo_vendor-cbindgen-android: submodule-update |
274 | 274 | cargo_vendor-cbindgen: submodule-update
|
275 | 275 | $(rbm) build cbindgen --step cargo_vendor --target nightly --target torbrowser-linux-x86_64
|
276 | 276 | |
277 | -cargo_vendor-lucetc: submodule-update
|
|
278 | - $(rbm) build lucetc --step cargo_vendor --target nightly --target torbrowser-linux-x86_64
|
|
279 | - |
|
280 | 277 | cargo_vendor-uniffi-rs: submodule-update
|
281 | 278 | $(rbm) build uniffi-rs --step cargo_vendor --target nightly --target torbrowser-linux-x86_64
|
282 | 279 |
... | ... | @@ -24,7 +24,7 @@ cd build |
24 | 24 | cmake ../llvm -GNinja \
|
25 | 25 | -DCMAKE_INSTALL_PREFIX=$distdir \
|
26 | 26 | -DCMAKE_BUILD_TYPE=Release \
|
27 | - -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64[% IF c("var/rlbox") -%];WebAssembly[% END %]" \
|
|
27 | + -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64;WebAssembly" \
|
|
28 | 28 | -DLLVM_ENABLE_PROJECTS="clang;lld" \
|
29 | 29 | -DLLVM_ENABLE_ZLIB=ON \
|
30 | 30 | -DLLVM_INSTALL_UTILS=ON \
|
... | ... | @@ -49,10 +49,7 @@ export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bi |
49 | 49 | rtdir=/var/tmp/dist/clang/lib/clang/[% pc("clang", "version") %]/lib/wasi
|
50 | 50 | [% END -%]
|
51 | 51 | mkdir -p $rtdir
|
52 | - cp /var/tmp/dist/wasi-sysroot/lib/clang/11.0.0/lib/wasi/libclang_rt.builtins-wasm32.a $rtdir
|
|
53 | - tar -C /var/tmp/dist -xf [% c('input_files_by_name/lucetc') %]
|
|
54 | - export PATH="/var/tmp/dist/lucetc/bin:$PATH"
|
|
55 | - export WASM_SANDBOXED_LIBRARIES=graphite,ogg
|
|
52 | + cp /var/tmp/dist/wasi-sysroot/lib/clang/*/lib/wasi/libclang_rt.builtins-wasm32.a $rtdir
|
|
56 | 53 | export WASI_SYSROOT=/var/tmp/dist/wasi-sysroot/share/wasi-sysroot
|
57 | 54 | [% END -%]
|
58 | 55 |
... | ... | @@ -158,9 +158,6 @@ input_files: |
158 | 158 | - project: wasi-sysroot
|
159 | 159 | name: wasi-sysroot
|
160 | 160 | enable: '[% c("var/rlbox") %]'
|
161 | - - project: lucetc
|
|
162 | - name: lucetc
|
|
163 | - enable: '[% c("var/rlbox") %]'
|
|
164 | 161 | - project: node
|
165 | 162 | name: node
|
166 | 163 | - project: nasm
|
... | ... | @@ -213,15 +213,5 @@ needed=$(perl -MYAML::XS -e "$p") |
213 | 213 | current='[% pc("wasi-sysroot", "git_hash") %]'
|
214 | 214 | check_update_needed wasi-sdk "$needed" "$current"
|
215 | 215 | |
216 | - |
|
217 | -# lucetc
|
|
218 | -read -d '' p << 'EOF' || true
|
|
219 | -my $d = YAML::XS::LoadFile('taskcluster/ci/fetch/toolchains.yml');
|
|
220 | -print $d->{'lucetc-source'}{fetch}{revision};
|
|
221 | -EOF
|
|
222 | -needed=$(perl -MYAML::XS -e "$p")
|
|
223 | -current='[% pc("lucetc", "git_hash") %]'
|
|
224 | -check_update_needed lucetc "$needed" "$current"
|
|
225 | - |
|
226 | 216 | # End RLBox
|
227 | 217 | [% END -%] |
... | ... | @@ -26,6 +26,18 @@ cp -r /var/tmp/dist/compiler-rt/* /var/tmp/dist/clang/ |
26 | 26 | tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %]
|
27 | 27 | export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/node/bin:/var/tmp/dist/clang/bin:/var/tmp/dist/binutils/bin:$PATH"
|
28 | 28 | |
29 | +[% IF c("var/rlbox") -%]
|
|
30 | + tar -C /var/tmp/dist -xf [% c('input_files_by_name/wasi-sysroot') %]
|
|
31 | + # XXX: We need the libclang_rt.builtins-wasm32.a in our clang lib directory.
|
|
32 | + # Copy it over.
|
|
33 | + # https://searchfox.org/mozilla-central/source/build/build-clang/build-clang.py#890,
|
|
34 | + # include it directly in our clang
|
|
35 | + rtdir=/var/tmp/dist/clang/lib/clang/[% pc("clang", "version") %]/lib/wasi
|
|
36 | + mkdir -p $rtdir
|
|
37 | + cp /var/tmp/dist/wasi-sysroot/lib/clang/*/lib/wasi/libclang_rt.builtins-wasm32.a $rtdir
|
|
38 | + export WASI_SYSROOT=/var/tmp/dist/wasi-sysroot/share/wasi-sysroot
|
|
39 | +[% END -%]
|
|
40 | + |
|
29 | 41 | tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
|
30 | 42 | |
31 | 43 | cd /var/tmp/build/[% project %]-[% c("version") %]
|
... | ... | @@ -173,6 +173,9 @@ input_files: |
173 | 173 | name: clang
|
174 | 174 | - project: 'compiler-rt'
|
175 | 175 | name: 'compiler-rt'
|
176 | + - project: wasi-sysroot
|
|
177 | + name: wasi-sysroot
|
|
178 | + enable: '[% c("var/rlbox") %]'
|
|
176 | 179 | - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
|
177 | 180 | name: gradle-dependencies
|
178 | 181 | exec: '[% INCLUDE "fetch-gradle-dependencies" %]' |
1 | -From ce82762aef3f8cdbdd340f39f95d2491f69a7da0 Mon Sep 17 00:00:00 2001
|
|
2 | -From: Nicolas Vigier <boklm@xxxxxxxxxxxxxx>
|
|
3 | -Date: Mon, 29 Mar 2021 13:42:48 +0200
|
|
4 | -Subject: [PATCH] Remove -march=native from COMMON_CFLAGS
|
|
5 | - |
|
6 | -The -march=native flag is causing an error on some hardware. It can also
|
|
7 | -make the build non-reproducible when not building on the same hardware.
|
|
8 | ----
|
|
9 | - lucet-builtins/Makefile | 2 +-
|
|
10 | - 1 file changed, 1 insertion(+), 1 deletion(-)
|
|
11 | - |
|
12 | -diff --git a/lucet-builtins/Makefile b/lucet-builtins/Makefile
|
|
13 | -index 6ddbcfd..de7e540 100644
|
|
14 | ---- a/lucet-builtins/Makefile
|
|
15 | -+++ b/lucet-builtins/Makefile
|
|
16 | -@@ -7,7 +7,7 @@ LIBBUILTINS_OBJS:=$(addprefix build/, \
|
|
17 | - strcmp.o \
|
|
18 | - strlen.o )
|
|
19 | -
|
|
20 | --COMMON_CFLAGS:= --std=gnu99 -Ofast -Wall -Werror -march=native -fPIC \
|
|
21 | -+COMMON_CFLAGS:= --std=gnu99 -Ofast -Wall -Werror -fPIC \
|
|
22 | - -I../lucet-runtime/include
|
|
23 | -
|
|
24 | - default: build/libbuiltins.so |
1 | -#!/bin/bash
|
|
2 | -[% c("var/set_default_env") -%]
|
|
3 | -# XXX: Do we need the GCC part here if we set CC to clang anyway?
|
|
4 | -[% IF c("var/linux") %]
|
|
5 | - [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'),
|
|
6 | - hardened_gcc => 0 }) %]
|
|
7 | - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %]
|
|
8 | - export PATH="/var/tmp/dist/binutils/bin:$PATH"
|
|
9 | -[% END -%]
|
|
10 | -distdir=/var/tmp/dist
|
|
11 | -builddir=/var/tmp/build/[% project %]
|
|
12 | - |
|
13 | -mkdir -p $distdir
|
|
14 | -tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %]
|
|
15 | -tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %]
|
|
16 | -tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %]
|
|
17 | -tar -C /var/tmp/dist -xf [% c('input_files_by_name/wasi-sysroot') %]
|
|
18 | -export PATH="/var/tmp/dist/cmake/bin:/var/tmp/dist/clang/bin:/var/tmp/dist/rust/bin:$PATH"
|
|
19 | -export CC=$distdir/clang/bin/clang
|
|
20 | -export CFLAGS="-L$distdir/clang/lib"
|
|
21 | -export CXX=$distdir/clang/bin/clang++
|
|
22 | -export CXXFLAGS=$CFLAGS
|
|
23 | -export AR=$distdir/clang/bin/llvm-ar
|
|
24 | -export RUSTFLAGS="-C linker=$CXX -C link-arg=$CXXFLAGS"
|
|
25 | -export LUCET_PREFIX=$distdir/[% project %]
|
|
26 | -# XXX: Why do we need that when Mozilla doesn't? See: taskcluster/scripts/misc/build-lucetc.sh
|
|
27 | -export WASI_SYSROOT=$distdir/wasi-sysroot
|
|
28 | - |
|
29 | -mkdir -p /var/tmp/build
|
|
30 | -tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
|
|
31 | - |
|
32 | -# Now prepare the offline build
|
|
33 | -# Move the directory for hardcoding the path in .cargo/config
|
|
34 | -mv /var/tmp/build/[% project %]-[% c('version') %] $builddir
|
|
35 | -tar -C $builddir -xf [% c('input_files_by_name/lucetc-vendor') %]
|
|
36 | -cd $builddir
|
|
37 | -# .cargo exists already, let's just add to it
|
|
38 | -cat >> .cargo/config << 'EOF'
|
|
39 | - |
|
40 | -[source.crates-io]
|
|
41 | -replace-with = "vendored-sources"
|
|
42 | - |
|
43 | -[source.vendored-sources]
|
|
44 | -directory = "/var/tmp/build/lucetc/vendor"
|
|
45 | -EOF
|
|
46 | - |
|
47 | -patch -p1 < $rootdir/Remove-march-native-from-COMMON_CFLAGS.patch
|
|
48 | - |
|
49 | -make -j[% c("num_procs") %] build
|
|
50 | -# XXX: Should not be needed, just the lucetc binary, see: taskcluster/scripts/misc/build-lucetc.sh
|
|
51 | -make install
|
|
52 | - |
|
53 | -cd $distdir
|
|
54 | -[% c('tar', {
|
|
55 | - tar_src => [ project ],
|
|
56 | - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
|
|
57 | - }) %] |
1 | -# vim: filetype=yaml sw=2
|
|
2 | -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
|
|
3 | -version: '[% c("abbrev") %]'
|
|
4 | -git_hash: d582d76bf0d17984501f3933688bf7a1eb5cf208
|
|
5 | -git_url: https://github.com/PLSysSec/lucet_sandbox_compiler/
|
|
6 | -git_submodule: 1
|
|
7 | - |
|
8 | -container:
|
|
9 | - use_container: 1
|
|
10 | - |
|
11 | -input_files:
|
|
12 | - - project: container-image
|
|
13 | - - name: binutils
|
|
14 | - project: binutils
|
|
15 | - enable: '[% c("var/linux") %]'
|
|
16 | - # Our clang still needs GCC parts (libstdc++ for instance) so we include that
|
|
17 | - # one here even though compilation gets done solely by clang.
|
|
18 | - - project: '[% c("var/compiler") %]'
|
|
19 | - name: '[% c("var/compiler") %]'
|
|
20 | - enable: '[% c("var/linux") %]'
|
|
21 | - - name: cmake
|
|
22 | - project: cmake
|
|
23 | - - name: clang
|
|
24 | - project: clang
|
|
25 | - - name: rust
|
|
26 | - project: rust
|
|
27 | - - name: wasi-sysroot
|
|
28 | - project: wasi-sysroot
|
|
29 | - # Use `make cargo_vendor-lucetc` to re-generate the vendor tarball
|
|
30 | - - name: lucetc-vendor
|
|
31 | - URL: 'https://people.torproject.org/~boklm/mirrors/sources/lucetc-vendor-[% c("version") %].tar.bz2'
|
|
32 | - sha256sum: 6b044ed76bc8870040174c8fbfa49c3a791b3aba7d32dd00cad541025eb16077
|
|
33 | - - filename: Remove-march-native-from-COMMON_CFLAGS.patch
|
|
34 | - |
|
35 | -steps:
|
|
36 | - cargo_vendor:
|
|
37 | - filename: '[% project %]-vendor-[% c("version") %].tar.bz2'
|
|
38 | - input_files:
|
|
39 | - - project: container-image
|
|
40 | - pkg_type: build
|
|
41 | - - project: rust
|
|
42 | - name: rust
|
|
43 | - pkg_type: build |
1 | +#!/bin/bash
|
|
2 | +[% c("var/set_default_env") -%]
|
|
3 | +mkdir -p /var/tmp/dist
|
|
4 | +mv $rootdir/[% project %]-[% c('version') %].tar.gz [% dest_dir %]/[% c("filename") %] |
1 | +# vim: filetype=yaml sw=2
|
|
2 | +version: '[% c("abbrev") %]'
|
|
3 | +git_url: https://git.savannah.gnu.org/git/config.git
|
|
4 | +git_hash: c179db1b6f2ae484bfca1e9f8bae273e3319fa7d
|
|
5 | +filename: '[% project %]-[% c("version") %].tar.gz' |
1 | +#!/bin/bash
|
|
2 | +[% c("var/set_default_env") -%]
|
|
3 | +mkdir -p /var/tmp/dist
|
|
4 | +mv $rootdir/[% project %]-[% c('version') %].tar.gz [% dest_dir %]/[% c("filename") %] |
1 | +# vim: filetype=yaml sw=2
|
|
2 | +version: '[% c("abbrev") %]'
|
|
3 | +git_url: https://github.com/WebAssembly/wasi-libc.git
|
|
4 | +git_hash: 9886d3d6200fcc3726329966860fc058707406cd
|
|
5 | +filename: '[% c("project") %]-[% c("version") %].tar.gz' |
1 | 1 | #!/bin/bash
|
2 | 2 | [% c("var/set_default_env") -%]
|
3 | -[% IF c("var/linux") %]
|
|
4 | - [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'),
|
|
5 | - hardened_gcc => 0 }) %]
|
|
6 | - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %]
|
|
7 | - export PATH="/var/tmp/dist/binutils/bin:$PATH"
|
|
8 | -[% END -%]
|
|
9 | -distdir=/var/tmp/dist
|
|
10 | -builddir=/var/tmp/build/[% project %]
|
|
3 | +distdir=/var/tmp/dist/[% project %]
|
|
4 | +builddir=/var/tmp/build/[% project %]-[% c("abbrev") %]
|
|
11 | 5 | mkdir -p $distdir
|
12 | 6 | tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %]
|
13 | 7 | tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %]
|
14 | -export PATH=/var/tmp/dist/binutils/bin:/var/tmp/dist/cmake/bin:/var/tmp/dist/ninja:$PATH
|
|
8 | +export PATH="/var/tmp/dist/ninja:/var/tmp/dist/cmake/bin:$PATH"
|
|
9 | + |
|
10 | +[% IF c("var/linux") -%]
|
|
11 | + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
|
|
12 | + [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %]
|
|
13 | +[% END -%]
|
|
15 | 14 | |
16 | 15 | mkdir -p /var/tmp/build
|
17 | 16 | tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
|
18 | 17 | |
19 | -mv /var/tmp/build/[% project %]-[% c('version') %] $builddir
|
|
18 | +cd /var/tmp/build
|
|
19 | +tar -xf $rootdir/[% project %]-[% c('version') %].tar.gz
|
|
20 | 20 | cd $builddir
|
21 | -# We have no .git in our tar ball but the script version.sh used by
|
|
22 | -# the Makefile depends on that. We replace the script.
|
|
21 | + |
|
22 | +pushd src
|
|
23 | +rmdir config llvm-project wasi-libc
|
|
24 | +tar -xf $rootdir/[% c('input_files_by_name/wasi-config') %]
|
|
25 | +mv wasi-config-* config
|
|
26 | +tar -xf $rootdir/[% c('input_files_by_name/clang-source') %]
|
|
27 | +mv clang-source llvm-project
|
|
28 | +export LLVM_HOME=$(pwd)/llvm-project
|
|
29 | +tar -xf $rootdir/[% c('input_files_by_name/wasi-libc') %]
|
|
30 | +mv wasi-libc-* wasi-libc
|
|
31 | +popd
|
|
32 | + |
|
33 | +# What follows has been copied from Firefox's
|
|
34 | +# taskcluster/scripts/misc/build-sysroot-wasi.sh and adapted to
|
|
35 | +# tor-browser-build.
|
|
36 | + |
|
37 | +mkdir -p build/install/wasi
|
|
38 | +# The wasi-sdk build system wants to build clang itself. We trick it into
|
|
39 | +# thinking it did, and put our own clang where it would have built its own.
|
|
40 | +tar -C build -xf $rootdir/[% c('input_files_by_name/clang') %]
|
|
41 | +mv build/clang build/llvm
|
|
42 | +touch build/llvm.BUILT
|
|
43 | + |
|
44 | +# The wasi-sdk build system wants a clang and an ar binary in
|
|
45 | +# build/install/$PREFIX/bin
|
|
46 | +ln -s $(pwd)/build/llvm/bin build/install/wasi/bin
|
|
47 | +ln -s llvm-ar build/install/wasi/bin/ar
|
|
48 | + |
|
49 | +# tor-browser-build: we have no .git in our tarball but the script version.sh
|
|
50 | +# used by the Makefile depends on that. We replace the script.
|
|
23 | 51 | cat > 'version.sh' << EOF
|
24 | 52 | #!/bin/sh
|
25 | 53 | echo '[% c("abbrev") %]'
|
26 | 54 | EOF
|
27 | 55 | |
28 | -# XXX: We don't want to use the clang 9.0 wasi-sdk would use, see:
|
|
29 | -# https://bugzilla.mozilla.org/show_bug.cgi?id=1605708
|
|
30 | -make -j[% c("num_procs") %] PREFIX=$distdir/[% project %] DESTDIR=/
|
|
56 | +# Build wasi-libc, libc++ and libc++abi.
|
|
57 | +make \
|
|
58 | + LLVM_PROJ_DIR=$LLVM_HOME \
|
|
59 | + PREFIX=/wasi \
|
|
60 | + build/wasi-libc.BUILT \
|
|
61 | + build/compiler-rt.BUILT \
|
|
62 | + NINJA_FLAGS='-j[% c("num_procs") %]'
|
|
63 | + |
|
64 | +# Does Mozilla maybe do this when compiling Clang?
|
|
65 | +rtdir="build/llvm/lib/clang/$(ls build/llvm/lib/clang)/lib/wasi"
|
|
66 | +mkdir -p "$rtdir"
|
|
67 | +cp build/compiler-rt/lib/wasi/libclang_rt.builtins-wasm32.a "$rtdir/"
|
|
68 | + |
|
69 | +make \
|
|
70 | + LLVM_PROJ_DIR=$LLVM_HOME \
|
|
71 | + PREFIX=/wasi \
|
|
72 | + build/libcxx.BUILT \
|
|
73 | + NINJA_FLAGS='-j[% c("num_procs") %]'
|
|
74 | + |
|
75 | +mv build/install/wasi/share $distdir/
|
|
76 | +mv build/install/wasi/lib $distdir/
|
|
31 | 77 | |
32 | -cd $distdir
|
|
78 | +cd /var/tmp/dist
|
|
33 | 79 | [% c('tar', {
|
34 | 80 | tar_src => [ project ],
|
35 | 81 | tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
|
1 | 1 | # vim: filetype=yaml sw=2
|
2 | -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
|
|
2 | +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
|
|
3 | 3 | version: '[% c("abbrev") %]'
|
4 | -git_hash: b36c433738f0c29160a5ac1c1cee1b1b884bf4a0
|
|
5 | -git_url: https://github.com/CraneStation/wasi-sdk
|
|
6 | -git_submodule: 1
|
|
4 | +# Notice: we are not enabling submodules because we use the same hacks as
|
|
5 | +# Mozilla and re-use the LLVM we already build.
|
|
6 | +# So, be sure to update also wasi-libc and wasi-config when you update this
|
|
7 | +# git hash!
|
|
8 | +git_hash: 37ae6af88201884c8b98a65adcd6d8cd1284f95e
|
|
9 | +git_url: https://github.com/WebAssembly/wasi-sdk.git
|
|
10 | +git_submodule: 0
|
|
7 | 11 | |
8 | 12 | container:
|
9 | 13 | use_container: 1
|
10 | 14 | |
11 | 15 | input_files:
|
12 | 16 | - project: container-image
|
13 | - - name: binutils
|
|
14 | - project: binutils
|
|
15 | - enable: '[% c("var/linux") %]'
|
|
16 | - - project: '[% c("var/compiler") %]'
|
|
17 | - name: '[% c("var/compiler") %]'
|
|
17 | + # We do not use GCC, but we need its libsdc++ to run Clang
|
|
18 | + - name: '[% c("var/compiler") %]'
|
|
19 | + project: '[% c("var/compiler") %]'
|
|
18 | 20 | enable: '[% c("var/linux") %]'
|
21 | + - name: clang
|
|
22 | + project: clang
|
|
23 | + - project: llvm-project
|
|
24 | + name: clang-source
|
|
19 | 25 | - name: cmake
|
20 | 26 | project: cmake
|
21 | 27 | - name: ninja
|
22 | 28 | project: ninja
|
29 | + - name: python
|
|
30 | + project: python
|
|
31 | + enable: '[% c("var/linux") %]'
|
|
32 | + - name: wasi-config
|
|
33 | + project: wasi-config
|
|
34 | + - name: wasi-libc
|
|
35 | + project: wasi-libc |
... | ... | @@ -168,6 +168,8 @@ var: |
168 | 168 | - zh-rCN
|
169 | 169 | - zh-rTW
|
170 | 170 | |
171 | + rlbox: 1
|
|
172 | + |
|
171 | 173 | sign_build: '[% ENV.RBM_SIGN_BUILD %]'
|
172 | 174 | sign_build_gpg_opts: '[% ENV.RBM_GPG_OPTS %]'
|
173 | 175 | |
... | ... | @@ -401,8 +403,6 @@ targets: |
401 | 403 | osname: linux-x86_64
|
402 | 404 | linux-cross: 0
|
403 | 405 | arch_debian: amd64
|
404 | - # We only support RLBox on the nightly channel and x86_64 for now
|
|
405 | - rlbox: 0
|
|
406 | 406 | linux-i686:
|
407 | 407 | arch: i686
|
408 | 408 | var:
|
... | ... | @@ -569,7 +569,6 @@ targets: |
569 | 569 | FLAGS: "-target [% c('var/build_target') %] -B $cctoolsdir -isysroot $sysrootdir [% IF c('var/macos-aarch64') %]-mcpu=apple-m1[% END %]"
|
570 | 570 | LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie"
|
571 | 571 | locale_ja: ja-JP-mac
|
572 | - rlbox: 0
|
|
573 | 572 | deps:
|
574 | 573 | - build-essential
|
575 | 574 | - faketime
|