Only run frozen-abi build script when needed (#2443)

* add cfg(feature = "frozen-abi") to build.rs * only depend on rustc_version when frozen-abi feature is activated * remove extraneous dirs that snuck in from another branch * update perf/build.rs as it's different from the standard build script * use symlink for svm/build.rs * remove unused build dep rustc_version from wen-restart * fmt Cargo.toml
anza-xyz · Aug 8, 2024 · 77ea09a · 77ea09a
1 parent c99095d
commit 77ea09a
Show file tree

Hide file tree

Showing 33 changed files with 67 additions and 78 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/accounts-db/Cargo.toml b/accounts-db/Cargo.toml
@@ -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 = [
@@ -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",

diff --git a/bloom/Cargo.toml b/bloom/Cargo.toml
@@ -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",

diff --git a/builtins-default-costs/Cargo.toml b/builtins-default-costs/Cargo.toml
@@ -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",
 ]
diff --git a/cargo-registry/Cargo.toml b/cargo-registry/Cargo.toml
@@ -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 = []
diff --git a/compute-budget/Cargo.toml b/compute-budget/Cargo.toml
@@ -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",
 ]
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -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",

diff --git a/cost-model/Cargo.toml b/cost-model/Cargo.toml
@@ -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",

diff --git a/curves/secp256k1-recover/Cargo.toml b/curves/secp256k1-recover/Cargo.toml
@@ -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"]
diff --git a/frozen-abi/Cargo.toml b/frozen-abi/Cargo.toml
@@ -31,3 +31,8 @@ solana-logger = { workspace = true }
 
 [build-dependencies]
 rustc_version = { workspace = true }
+
+[features]
+default = ["frozen-abi"]
+# no reason to deactivate this. It's needed because the build.rs is reused elsewhere
+frozen-abi = []
diff --git a/frozen-abi/build.rs b/frozen-abi/build.rs
@@ -1,7 +1,10 @@
+#[cfg(feature = "frozen-abi")]
 extern crate rustc_version;
+#[cfg(feature = "frozen-abi")]
 use rustc_version::{version_meta, Channel};
 
 fn main() {
+    #[cfg(feature = "frozen-abi")]
     // Copied and adapted from
     // https://github.com/Kimundi/rustc-version-rs/blob/1d692a965f4e48a8cb72e82cda953107c0d22f47/README.md#example
     // Licensed under Apache-2.0 + MIT

diff --git a/frozen-abi/macro/Cargo.toml b/frozen-abi/macro/Cargo.toml
@@ -19,3 +19,8 @@ syn = { workspace = true, features = ["full", "extra-traits"] }
 
 [build-dependencies]
 rustc_version = { workspace = true }
+
+[features]
+default = ["frozen-abi"]
+# no reason to deactivate this. It's needed because the build.rs is reused elsewhere
+frozen-abi = []
diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml
@@ -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",

diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml
@@ -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",

diff --git a/perf/Cargo.toml b/perf/Cargo.toml
@@ -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",

diff --git a/perf/build.rs b/perf/build.rs
@@ -1,4 +1,6 @@
+#[cfg(feature = "frozen-abi")]
 extern crate rustc_version;
+#[cfg(feature = "frozen-abi")]
 use rustc_version::{version_meta, Channel};
 
 fn main() {
@@ -15,6 +17,7 @@ fn main() {
     // Copied and adapted from
     // https://github.com/Kimundi/rustc-version-rs/blob/1d692a965f4e48a8cb72e82cda953107c0d22f47/README.md#example
     // Licensed under Apache-2.0 + MIT
+    #[cfg(feature = "frozen-abi")]
     match version_meta().unwrap().channel {
         Channel::Stable => {
             println!("cargo:rustc-cfg=RUSTC_WITHOUT_SPECIALIZATION");

diff --git a/program-runtime/Cargo.toml b/program-runtime/Cargo.toml
@@ -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",

diff --git a/programs/address-lookup-table/Cargo.toml b/programs/address-lookup-table/Cargo.toml
@@ -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"]