diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /devel/electron35/files/patch-build_rust_cargo__crate.gni | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'devel/electron35/files/patch-build_rust_cargo__crate.gni')
| -rw-r--r-- | devel/electron35/files/patch-build_rust_cargo__crate.gni | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/devel/electron35/files/patch-build_rust_cargo__crate.gni b/devel/electron35/files/patch-build_rust_cargo__crate.gni deleted file mode 100644 index 8b1b8e5144e9..000000000000 --- a/devel/electron35/files/patch-build_rust_cargo__crate.gni +++ /dev/null @@ -1,25 +0,0 @@ ---- build/rust/cargo_crate.gni.orig 2025-04-14 21:12:04 UTC -+++ build/rust/cargo_crate.gni -@@ -267,6 +267,12 @@ template("cargo_crate") { - # Don't import the `chromium` crate into third-party code. - no_chromium_prelude = true - -+ # Don't depend on the chrome-specific #[global_allocator] crate from -+ # third-party code. This avoids some dependency cycle issues. The allocator -+ # crate will still be used if it exists anywhere in the dependency graph for -+ # a given linked artifact. -+ no_allocator_crate = true -+ - rustc_metadata = _rustc_metadata - - # TODO(crbug.com/40259764): don't default to true. This requires changes to -@@ -504,6 +510,9 @@ template("cargo_crate") { - - # Don't import the `chromium` crate into third-party code. - no_chromium_prelude = true -+ -+ # Build scripts do not need to link to chrome's allocator. -+ no_allocator_crate = true - - # The ${_build_script_name}_output target looks for the exe in this - # location. Due to how the Windows component build works, this has to |
