Skip to content

Commit

Permalink
Allow building for wasm32-wasi target using Bazel. (proxy-wasm#50)
Browse files Browse the repository at this point in the history
While there, update Bazel to 3.7.0.

Signed-off-by: Piotr Sikora <piotrsikora@google.com>
  • Loading branch information
PiotrSikora authored Nov 7, 2020
1 parent 7b24544 commit e923d68
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .bazelrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Force Bazel to use --target=wasm32-unknown-unknown.
build --platforms=@io_bazel_rules_rust//rust/platform:wasm
# Force Bazel to use --target=wasm32-wasi
build --platforms=@io_bazel_rules_rust//rust/platform:wasi
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.4.1
3.7.0
7 changes: 5 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,11 @@ jobs:
~/.cargo/registry
key: ${{ hashFiles('WORKSPACE', '.bazelrc', '.bazelversion', 'bazel/cargo/Cargo.lock') }}

- name: Build
run: bazelisk build //...
- name: Build (wasm32-unknown-unknown)
run: bazelisk --bazelrc=/dev/null build --platforms=@io_bazel_rules_rust//rust/platform:wasm //...

- name: Build (wasm32-wasi)
run: bazelisk --bazelrc=/dev/null build --platforms=@io_bazel_rules_rust//rust/platform:wasi //...

- name: Format (buildifier)
run: |
Expand Down
11 changes: 11 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,17 @@ panic = "abort"
workspace_path = "//bazel/cargo"
genmode = "Remote"

[package.metadata.raze.crates.libc.'0.2.80']
additional_flags = [
"--cfg=libc_priv_mod_use",
"--cfg=libc_union",
"--cfg=libc_const_size_of",
"--cfg=libc_align",
"--cfg=libc_core_cvoid",
"--cfg=libc_packedN",
"--cfg=libc_cfg_target_vendor",
]

[package.metadata.raze.crates.log.'0.4.11']
additional_flags = ["--cfg=atomic_cas"]

Expand Down
7 changes: 7 additions & 0 deletions bazel/cargo/remote/BUILD.libc-0.2.80.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@ rust_library(
edition = "2015",
rustc_flags = [
"--cap-lints=allow",
"--cfg=libc_priv_mod_use",
"--cfg=libc_union",
"--cfg=libc_const_size_of",
"--cfg=libc_align",
"--cfg=libc_core_cvoid",
"--cfg=libc_packedN",
"--cfg=libc_cfg_target_vendor",
],
tags = [
"cargo-raze",
Expand Down

0 comments on commit e923d68

Please sign in to comment.