diff --git a/.bazelrc b/.bazelrc index 800bf8f4..38ca0fbf 100644 --- a/.bazelrc +++ b/.bazelrc @@ -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 diff --git a/.bazelversion b/.bazelversion index 47b322c9..7c69a55d 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -3.4.1 +3.7.0 diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 6f199be6..3df51920 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -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: | diff --git a/Cargo.toml b/Cargo.toml index 299166e0..2d70b5a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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"] diff --git a/bazel/cargo/remote/BUILD.libc-0.2.80.bazel b/bazel/cargo/remote/BUILD.libc-0.2.80.bazel index 838522ff..34e15553 100644 --- a/bazel/cargo/remote/BUILD.libc-0.2.80.bazel +++ b/bazel/cargo/remote/BUILD.libc-0.2.80.bazel @@ -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",