diff options
Diffstat (limited to 'debian/patches/u-profiler.patch')
-rw-r--r-- | debian/patches/u-profiler.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/debian/patches/u-profiler.patch b/debian/patches/u-profiler.patch index 37f63af69..f83e4fcbc 100644 --- a/debian/patches/u-profiler.patch +++ b/debian/patches/u-profiler.patch @@ -46,7 +46,7 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs -@@ -314,6 +314,10 @@ pub fn std_cargo(builder: &Builder<'_>, +@@ -305,6 +305,10 @@ pub fn std_cargo(builder: &Builder<'_>, cargo.env("MACOSX_DEPLOYMENT_TARGET", target); } @@ -59,16 +59,16 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. // `compiler-rt` repository, but our `src/llvm-project` submodule isn't --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs -@@ -454,7 +454,7 @@ pub struct Target { +@@ -467,7 +467,7 @@ pub struct Target { pub linker: Option<PathBuf>, pub ndk: Option<PathBuf>, pub sanitizers: Option<bool>, - pub profiler: Option<bool>, + pub profiler: Option<StringOrBool>, + pub rpath: Option<bool>, pub crt_static: Option<bool>, pub musl_root: Option<PathBuf>, - pub musl_libdir: Option<PathBuf>, -@@ -715,9 +715,9 @@ define_config! { +@@ -796,9 +796,9 @@ define_config! { } } @@ -80,7 +80,7 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. String(String), Bool(bool), } -@@ -728,6 +728,12 @@ impl Default for StringOrBool { +@@ -809,6 +809,12 @@ impl Default for StringOrBool { } } @@ -93,16 +93,16 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. define_config! { /// TOML representation of how the Rust build is configured. struct Rust { -@@ -799,7 +805,7 @@ define_config! { +@@ -880,7 +886,7 @@ define_config! { llvm_libunwind: Option<String> = "llvm-libunwind", android_ndk: Option<String> = "android-ndk", sanitizers: Option<bool> = "sanitizers", - profiler: Option<bool> = "profiler", + profiler: Option<StringOrBool> = "profiler", + rpath: Option<bool> = "rpath", crt_static: Option<bool> = "crt-static", musl_root: Option<String> = "musl-root", - musl_libdir: Option<String> = "musl-libdir", -@@ -1616,12 +1622,24 @@ impl Config { +@@ -1744,12 +1750,24 @@ impl Config { self.target_config.values().any(|t| t.sanitizers == Some(true)) || self.sanitizers } @@ -128,4 +128,4 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. + || self.profiler } - pub fn llvm_enabled(&self) -> bool { + pub fn rpath_enabled(&self, target: TargetSelection) -> bool { |