openharmony/third_party_rust_cxx
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_rust_cxx synced 2024-11-23 23:29:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #947 from dtolnay/bazel

Browse Source 
Pull in newer Bazel rules_rust
This commit is contained in:
David Tolnay 2021-10-05 18:14:11 -04:00 committed by GitHub
commit c7b0a289bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.bazelrc Normal file
View File

@ -0,0 +1 @@
build --@rules_rust//:extra_rustc_flags=-Clink-arg=-fuse-ld=lld

2
.github/workflows/ci.yml vendored
View File

@ -90,6 +90,8 @@ jobs:
chmod +x install.sh chmod +x install.sh
./install.sh --user ./install.sh --user
echo $HOME/bin >> $GITHUB_PATH echo $HOME/bin >> $GITHUB_PATH
- name: Install lld
run: sudo apt-get install lld
- run: bazel run demo --verbose_failures --noshow_progress - run: bazel run demo --verbose_failures --noshow_progress
- run: bazel test ... --verbose_failures --noshow_progress - run: bazel test ... --verbose_failures --noshow_progress

8
WORKSPACE
View File

@ -4,11 +4,11 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
http_archive( http_archive(
name = "rules_rust", name = "rules_rust",
sha256 = "697a6f4f2adbd1b00f792346d6eca4cd45f691be63069c7d7ebf4fcf82a377a8", sha256 = "4d6aa4554eaf5c7bf6da1dd1371b1455b3234676b234a299791635c50c61df91",
strip_prefix = "rules_rust-8bad4c5e4e53d9f6f8d4d5228e26a44d92f37ab2", strip_prefix = "rules_rust-238b998f108a099e5a227dbe312526406dda1f2d",
urls = [ urls = [
# Master branch as of 2021-04-11 # Main branch as of 2021-10-01
"https://github.com/bazelbuild/rules_rust/archive/8bad4c5e4e53d9f6f8d4d5228e26a44d92f37ab2.tar.gz", "https://github.com/bazelbuild/rules_rust/archive/238b998f108a099e5a227dbe312526406dda1f2d.tar.gz",
], ],
) )

5
tools/bazel/vendor.bzl
View File

@ -2,7 +2,8 @@
of a crate in the current workspace. of a crate in the current workspace.
""" """
load("@rules_rust//rust:repositories.bzl", "DEFAULT_RUST_VERSION", "load_arbitrary_tool") load("@rules_rust//rust:repositories.bzl", "load_arbitrary_tool")
load("@rules_rust//rust:rust.bzl", "rust_common")
def _impl(repository_ctx): def _impl(repository_ctx):
# Link cxx repository into @third-party. # Link cxx repository into @third-party.
@ -77,7 +78,7 @@ vendor = repository_rule(
attrs = { attrs = {
"cargo_version": attr.string( "cargo_version": attr.string(
doc = "The version of cargo to use", doc = "The version of cargo to use",
default = DEFAULT_RUST_VERSION, default = rust_common.default_version,
), ),
"cargo_iso_date": attr.string( "cargo_iso_date": attr.string(
doc = "The date of the tool (or None, if the version is a specific version)", doc = "The date of the tool (or None, if the version is a specific version)",