From f2aab12a8627b3afd1a4d9c38157968b2f012e0c Mon Sep 17 00:00:00 2001 From: kcbanner Date: Sun, 23 Jul 2023 14:07:14 -0400 Subject: [PATCH] compilation: change compiler_rt to inherit `strip` and `want_unwind_tables` from the parent compilation --- src/Compilation.zig | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Compilation.zig b/src/Compilation.zig index 4019e43c8d..2e269a7e80 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -5491,6 +5491,7 @@ fn buildOutputFromZig( .omit_frame_pointer = comp.bin_file.options.omit_frame_pointer, .want_valgrind = false, .want_tsan = false, + .want_unwind_tables = comp.bin_file.options.eh_frame_hdr, .want_pic = comp.bin_file.options.pic, .want_pie = comp.bin_file.options.pie, .emit_h = null, @@ -5639,9 +5640,5 @@ pub fn compilerRtOptMode(comp: Compilation) std.builtin.Mode { /// This decides whether to strip debug info for all zig-provided libraries, including /// compiler-rt, libcxx, libc, libunwind, etc. pub fn compilerRtStrip(comp: Compilation) bool { - if (comp.debug_compiler_runtime_libs) { - return comp.bin_file.options.strip; - } else { - return true; - } + return comp.bin_file.options.strip; }