Skip to content

Use 1.96.0-adapted libc/cc-rs branches for toolchain CI #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhaowenbo-vivo merged 1 commit into from
Aug 19, 2026
Merged

Use 1.96.0-adapted libc/cc-rs branches for toolchain CI #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2177,7 +2177,7 @@ checksum = "9fa0e2a1fcbe2f6be6c42e342259976206b383122fc152e872795338b5a3f3a7"
[[package]]
name = "libc"
version = "0.2.183"
source = "git+https://github.com/vivoblueos/libc?branch=blueos-dev#0ce164851406cbffc0020190f746fa7818173ac9"
source = "git+https://github.com/vivoblueos/libc?branch=v0.2.183#4730ac35f63c2819f12200b0e76b84bb6c539df8"

[[package]]
name = "libdbus-sys"
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,4 @@ codegen-units = 1
# For git dependencies, also add your source to ALLOWED_SOURCES in src/tools/tidy/src/extdeps.rs.
# BlueOS forks: libc and cc-rs for custom BlueOS target support.
[patch.crates-io]
libc = { git = "https://github.com/vivoblueos/libc", branch = "blueos-dev", version = "=0.2.183" }
libc = { git = "https://github.com/vivoblueos/libc", branch = "v0.2.183", version = "=0.2.183" }
4 changes: 2 additions & 2 deletions library/Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dependencies = [
[[package]]
name = "cc"
version = "1.2.28"
source = "git+https://github.com/vivoblueos/cc-rs?branch=blueos-dev#9d607663f64397e108b281355b4aa043d36c0662"
source = "git+https://github.com/vivoblueos/cc-rs?branch=v1.2.28#a6a2b5ec11fd25437781d12b7d7c882427ae9875"
dependencies = [
"shlex",
]
Expand Down Expand Up @@ -146,7 +146,7 @@ dependencies = [
[[package]]
name = "libc"
version = "0.2.183"
source = "git+https://github.com/vivoblueos/libc?branch=blueos-dev#0ce164851406cbffc0020190f746fa7818173ac9"
source = "git+https://github.com/vivoblueos/libc?branch=v0.2.183#4730ac35f63c2819f12200b0e76b84bb6c539df8"
dependencies = [
"rustc-std-workspace-core",
]
Expand Down
4 changes: 2 additions & 2 deletions library/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,5 @@ rustc-std-workspace-alloc = { path = 'rustc-std-workspace-alloc' }
rustc-std-workspace-std = { path = 'rustc-std-workspace-std' }
# BlueOS forks: add custom target support (BlueOS libc and cc-rs patches).
# These must be kept in sync with each other and with the target specs.
libc = { git = "https://github.com/vivoblueos/libc", branch = "blueos-dev", version = "=0.2.183" }
cc = { git = "https://github.com/vivoblueos/cc-rs", branch = "blueos-dev", version = "=1.2.28" }
libc = { git = "https://github.com/vivoblueos/libc", branch = "v0.2.183", version = "=0.2.183" }
cc = { git = "https://github.com/vivoblueos/cc-rs", branch = "v1.2.28", version = "=1.2.28" }
2 changes: 1 addition & 1 deletion src/bootstrap/Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ dependencies = [
[[package]]
name = "cc"
version = "1.2.28"
source = "git+https://github.com/vivoblueos/cc-rs?branch=blueos-dev#9d607663f64397e108b281355b4aa043d36c0662"
source = "git+https://github.com/vivoblueos/cc-rs?branch=v1.2.28#a6a2b5ec11fd25437781d12b7d7c882427ae9875"
dependencies = [
"shlex",
]
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,4 @@ bootstrap.debug = 1
[patch.crates-io]
# We're using https://source.android.com/docs/setup/reference/repo to manage BlueOS project
# and repo manages the hierarchy of the project.
cc = { git = "https://github.com/vivoblueos/cc-rs", branch = "blueos-dev", version = "=1.2.28" }
cc = { git = "https://github.com/vivoblueos/cc-rs", branch = "v1.2.28", version = "=1.2.28" }
4 changes: 2 additions & 2 deletions src/tools/tidy/src/extdeps.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ const ALLOWED_SOURCES: &[&str] = &[
r#""git+https://github.com/rust-lang/team#a5260e76d3aa894c64c56e6ddc8545b9a98043ec""#,
// BlueOS forks of cc-rs and libc, patched via git in library/Cargo.toml
// and src/bootstrap/Cargo.toml.
r#""git+https://github.com/vivoblueos/cc-rs?branch=blueos-dev#9d607663f64397e108b281355b4aa043d36c0662""#,
r#""git+https://github.com/vivoblueos/libc?branch=blueos-dev#0ce164851406cbffc0020190f746fa7818173ac9""#,
r#""git+https://github.com/vivoblueos/cc-rs?branch=v1.2.28#a6a2b5ec11fd25437781d12b7d7c882427ae9875""#,
r#""git+https://github.com/vivoblueos/libc?branch=v0.2.183#4730ac35f63c2819f12200b0e76b84bb6c539df8""#,
];

/// Checks for external package sources. `root` is the path to the directory that contains the
Expand Down
Loading