Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,18 @@ crate.annotation(
},
repositories = ["crate_index"],
)

inject_repo(
crate,
ot_openssl = "openssl",
)

crate.annotation(
build_script_data = ["@ot_openssl//:gen_dir"],
build_script_env = {
"PKG_CONFIG_PATH": "$(OPENSSL_PKG_CONFIG_PATH)",
"OPENSSL_DIR": "$(execpath @ot_openssl//:gen_dir)",
"OPENSSL_STATIC": "1",
},
build_script_toolchains = ["@lowrisc_opentitan//third_party/rust:openssl_pkg_config_path"],
crate = "openssl-sys",
repositories = ["crate_index"],
)
Expand Down
4 changes: 2 additions & 2 deletions MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions third_party/rust/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ config_setting(
values = {"define": "SPECIFY_BINDGEN_LIBSTDCXX=true"},
)

string_flag(
name = "openssl_pkg_config_path",
build_setting_default = "",
make_variable = "OPENSSL_PKG_CONFIG_PATH",
)

# Since rules_rust 0.23.0, bindgen depends on the llvm project and builds the
# llvm libaries from source. Building llvm from source has a huge impact on
# build times. Instead, we depend on a pre-built llvm release and instantiate
Expand Down
2 changes: 1 addition & 1 deletion util/prep-bazel-airgapped-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -euo pipefail

: "${REPO_TOP:=$(git rev-parse --show-toplevel)}"

: "${BAZELISK:=${REPO_TOP}/bazelisk.sh}"
: "${BAZELISK:=${REPO_TOP}/bazelisk.sh --host_jvm_args=-Xmx8g}"
: "${BAZEL_VERSION:=$(cat "${REPO_TOP}/.bazelversion")}"

: "${BAZEL_AIRGAPPED_DIR:=bazel-airgapped}"
Expand Down
Loading