diff options
Diffstat (limited to 'debian/patches/u-profiler.patch')
| -rw-r--r-- | debian/patches/u-profiler.patch | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/debian/patches/u-profiler.patch b/debian/patches/u-profiler.patch index f83e4fcbc..e7c1a3ced 100644 --- a/debian/patches/u-profiler.patch +++ b/debian/patches/u-profiler.patch @@ -14,9 +14,11 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. src/bootstrap/config.rs | 30 ++++++++++++++++++++++++------ 4 files changed, 38 insertions(+), 8 deletions(-) ---- a/config.example.toml -+++ b/config.example.toml -@@ -745,8 +745,10 @@ changelog-seen = 2 +Index: rust/config.example.toml +=================================================================== +--- rust.orig/config.example.toml ++++ rust/config.example.toml +@@ -752,8 +752,10 @@ changelog-seen = 2 # This option will override the same option under [build] section. #sanitizers = build.sanitizers (bool) @@ -29,8 +31,10 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. # This option will override the same option under [build] section. #profiler = build.profiler (bool) ---- a/library/profiler_builtins/build.rs -+++ b/library/profiler_builtins/build.rs +Index: rust/library/profiler_builtins/build.rs +=================================================================== +--- rust.orig/library/profiler_builtins/build.rs ++++ rust/library/profiler_builtins/build.rs @@ -6,6 +6,12 @@ use std::env; use std::path::Path; @@ -44,9 +48,11 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. let target = env::var("TARGET").expect("TARGET was not set"); let cfg = &mut cc::Build::new(); ---- a/src/bootstrap/compile.rs -+++ b/src/bootstrap/compile.rs -@@ -305,6 +305,10 @@ pub fn std_cargo(builder: &Builder<'_>, +Index: rust/src/bootstrap/compile.rs +=================================================================== +--- rust.orig/src/bootstrap/compile.rs ++++ rust/src/bootstrap/compile.rs +@@ -336,6 +336,10 @@ pub fn std_cargo(builder: &Builder<'_>, cargo.env("MACOSX_DEPLOYMENT_TARGET", target); } @@ -57,9 +63,11 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. // Determine if we're going to compile in optimized C intrinsics to // the `compiler-builtins` crate. These intrinsics live in LLVM's // `compiler-rt` repository, but our `src/llvm-project` submodule isn't ---- a/src/bootstrap/config.rs -+++ b/src/bootstrap/config.rs -@@ -467,7 +467,7 @@ pub struct Target { +Index: rust/src/bootstrap/config.rs +=================================================================== +--- rust.orig/src/bootstrap/config.rs ++++ rust/src/bootstrap/config.rs +@@ -533,7 +533,7 @@ pub struct Target { pub linker: Option<PathBuf>, pub ndk: Option<PathBuf>, pub sanitizers: Option<bool>, @@ -68,7 +76,7 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. pub rpath: Option<bool>, pub crt_static: Option<bool>, pub musl_root: Option<PathBuf>, -@@ -796,9 +796,9 @@ define_config! { +@@ -862,9 +862,9 @@ define_config! { } } @@ -80,7 +88,7 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. String(String), Bool(bool), } -@@ -809,6 +809,12 @@ impl Default for StringOrBool { +@@ -976,6 +976,12 @@ define_config! { } } @@ -91,9 +99,9 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. +} + define_config! { - /// TOML representation of how the Rust build is configured. - struct Rust { -@@ -880,7 +886,7 @@ define_config! { + /// TOML representation of how each build target is configured. + struct TomlTarget { +@@ -991,7 +997,7 @@ define_config! { llvm_libunwind: Option<String> = "llvm-libunwind", android_ndk: Option<String> = "android-ndk", sanitizers: Option<bool> = "sanitizers", @@ -102,7 +110,7 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. rpath: Option<bool> = "rpath", crt_static: Option<bool> = "crt-static", musl_root: Option<String> = "musl-root", -@@ -1744,12 +1750,24 @@ impl Config { +@@ -1887,12 +1893,24 @@ impl Config { self.target_config.values().any(|t| t.sanitizers == Some(true)) || self.sanitizers } |