Skip to content

Commit

Permalink
only depend on rustc_version when frozen-abi feature is activated
Browse files Browse the repository at this point in the history
  • Loading branch information
@kevinheavey
kevinheavey committed Aug 5, 2024
1 parent f0397d3 commit 66bf42d
Show file tree
Hide file tree
Showing 27 changed files with 217 additions and 51 deletions.
3 changes: 2 additions & 1 deletion accounts-db/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ test-case = { workspace = true }
targets = ["x86_64-unknown-linux-gnu"]

[build-dependencies]
rustc_version = { workspace = true }
rustc_version = { workspace = true, optional = true }

[features]
dev-context-only-utils = [
Expand All @@ -89,6 +89,7 @@ dev-context-only-utils = [
"dep:solana-vote-program",
]
frozen-abi = [
"dep:rustc_version",
"dep:solana-frozen-abi",
"dep:solana-frozen-abi-macro",
"solana-sdk/frozen-abi",
Expand Down
3 changes: 2 additions & 1 deletion bloom/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@ name = "solana_bloom"
targets = ["x86_64-unknown-linux-gnu"]

[build-dependencies]
rustc_version = { workspace = true }
rustc_version = { workspace = true, optional = true }

[features]
frozen-abi = [
"dep:rustc_version",
"dep:solana-frozen-abi",
"dep:solana-frozen-abi-macro",
"solana-sdk/frozen-abi",
Expand Down
3 changes: 2 additions & 1 deletion builtins-default-costs/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,11 @@ rand = "0.8.5"
targets = ["x86_64-unknown-linux-gnu"]

[build-dependencies]
rustc_version = { workspace = true }
rustc_version = { workspace = true, optional = true }

[features]
frozen-abi = [
"dep:rustc_version",
"dep:solana-frozen-abi",
"solana-vote-program/frozen-abi",
]
2 changes: 1 addition & 1 deletion cargo-registry/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ toml = { workspace = true }
targets = ["x86_64-unknown-linux-gnu"]

[build-dependencies]
rustc_version = { workspace = true }
rustc_version = { workspace = true, optional = true }

[features]
dev-context-only-utils = []
3 changes: 2 additions & 1 deletion compute-budget/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ solana-frozen-abi = { workspace = true, optional = true }
solana-sdk = { workspace = true }

[build-dependencies]
rustc_version = { workspace = true }
rustc_version = { workspace = true, optional = true }

[features]
frozen-abi = [
"dep:rustc_version",
"dep:solana-frozen-abi",
"solana-sdk/frozen-abi",
]
3 changes: 2 additions & 1 deletion core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,12 @@ test-case = { workspace = true }
sysctl = { workspace = true }

[build-dependencies]
rustc_version = { workspace = true }
rustc_version = { workspace = true, optional = true }

[features]
dev-context-only-utils = []
frozen-abi = [
"dep:rustc_version",
"dep:solana-frozen-abi",
"dep:solana-frozen-abi-macro",
"solana-accounts-db/frozen-abi",
Expand Down
3 changes: 2 additions & 1 deletion cost-model/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@ test-case = { workspace = true }
targets = ["x86_64-unknown-linux-gnu"]

[build-dependencies]
rustc_version = { workspace = true }
rustc_version = { workspace = true, optional = true }

[features]
frozen-abi = [
"dep:rustc_version",
"dep:solana-frozen-abi",
"dep:solana-frozen-abi-macro",
"solana-compute-budget/frozen-abi",
Expand Down
4 changes: 2 additions & 2 deletions curves/secp256k1-recover/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ borsh = { workspace = true }
libsecp256k1 = { workspace = true, features = ["hmac"] }

[build-dependencies]
rustc_version = { workspace = true }
rustc_version = { workspace = true, optional = true }

[features]
borsh = ["dep:borsh"]
frozen-abi = ["dep:solana-frozen-abi", "dep:solana-frozen-abi-macro"]
frozen-abi = ["dep:rustc_version", "dep:solana-frozen-abi", "dep:solana-frozen-abi-macro"]

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
3 changes: 2 additions & 1 deletion gossip/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,11 @@ solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
test-case = { workspace = true }

[build-dependencies]
rustc_version = { workspace = true }
rustc_version = { workspace = true, optional = true }

[features]
frozen-abi = [
"dep:rustc_version",
"dep:solana-frozen-abi",
"dep:solana-frozen-abi-macro",
"solana-bloom/frozen-abi",
Expand Down
3 changes: 2 additions & 1 deletion ledger/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,12 @@ spl-pod = { workspace = true }
test-case = { workspace = true }

[build-dependencies]
rustc_version = { workspace = true }
rustc_version = { workspace = true, optional = true }

[features]
dev-context-only-utils = []
frozen-abi = [
"dep:rustc_version",
"dep:solana-frozen-abi",
"dep:solana-frozen-abi-macro",
"solana-runtime/frozen-abi",
Expand Down
3 changes: 2 additions & 1 deletion perf/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,11 @@ solana-logger = { workspace = true }
test-case = { workspace = true }

[build-dependencies]
rustc_version = { workspace = true }
rustc_version = { workspace = true, optional = true }

[features]
frozen-abi = [
"dep:rustc_version",
"dep:solana-frozen-abi",
"dep:solana-frozen-abi-macro",
"solana-sdk/frozen-abi",
Expand Down
3 changes: 2 additions & 1 deletion program-runtime/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,11 @@ name = "solana_program_runtime"
targets = ["x86_64-unknown-linux-gnu"]

[build-dependencies]
rustc_version = { workspace = true }
rustc_version = { workspace = true, optional = true }

[features]
frozen-abi = [
"dep:rustc_version",
"dep:solana-frozen-abi",
"dep:solana-frozen-abi-macro",
"solana-compute-budget/frozen-abi",
Expand Down
2 changes: 1 addition & 1 deletion programs/address-lookup-table/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ solana-program-runtime = { workspace = true }
solana-sdk = { workspace = true }

[build-dependencies]
rustc_version = { workspace = true }
rustc_version = { workspace = true, optional = true }

[lib]
crate-type = ["lib"]
Expand Down
22 changes: 0 additions & 22 deletions programs/sbf/Cargo.lock
View file

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

2 changes: 1 addition & 1 deletion programs/stake-tests/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ solana-vote-program = { workspace = true }
test-case = { workspace = true }

[build-dependencies]
rustc_version = { workspace = true }
rustc_version = { workspace = true, optional = true }

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
2 changes: 1 addition & 1 deletion programs/stake/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ solana-logger = { workspace = true }
test-case = { workspace = true }

[build-dependencies]
rustc_version = { workspace = true }
rustc_version = { workspace = true, optional = true }

[lib]
crate-type = ["lib"]
Expand Down
3 changes: 2 additions & 1 deletion programs/vote/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ solana-logger = { workspace = true }
test-case = { workspace = true }

[build-dependencies]
rustc_version = { workspace = true }
rustc_version = { workspace = true, optional = true }

[lib]
crate-type = ["lib"]
Expand All @@ -41,6 +41,7 @@ targets = ["x86_64-unknown-linux-gnu"]

[features]
frozen-abi = [
"dep:rustc_version",
"dep:solana-frozen-abi",
"dep:solana-frozen-abi-macro",
"solana-program/frozen-abi",
Expand Down
2 changes: 1 addition & 1 deletion runtime-transaction/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ solana-program ={ workspace = true }
targets = ["x86_64-unknown-linux-gnu"]

[build-dependencies]
rustc_version = { workspace = true }
rustc_version = { workspace = true, optional = true }
3 changes: 2 additions & 1 deletion runtime/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,12 @@ test-case = { workspace = true }
targets = ["x86_64-unknown-linux-gnu"]

[build-dependencies]
rustc_version = { workspace = true }
rustc_version = { workspace = true, optional = true }

[features]
dev-context-only-utils = ["solana-svm/dev-context-only-utils"]
frozen-abi = [
"dep:rustc_version",
"dep:solana-frozen-abi",
"dep:solana-frozen-abi-macro",
"solana-accounts-db/frozen-abi",
Expand Down
Loading

0 comments on commit 66bf42d

Please sign in to comment.