From b9aecb4bab8fa93e159a33845929a2d0021d90e4 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Wed, 8 Jan 2025 22:53:04 +0100 Subject: zig: remove, because we bootstrapped in guix --- ...r-implicitly-add-rpaths-for-each-lib-dir-.patch | 40 ---------------------- 1 file changed, 40 deletions(-) delete mode 100644 zig-Revert-Never-implicitly-add-rpaths-for-each-lib-dir-.patch (limited to 'zig-Revert-Never-implicitly-add-rpaths-for-each-lib-dir-.patch') diff --git a/zig-Revert-Never-implicitly-add-rpaths-for-each-lib-dir-.patch b/zig-Revert-Never-implicitly-add-rpaths-for-each-lib-dir-.patch deleted file mode 100644 index 388b7c5..0000000 --- a/zig-Revert-Never-implicitly-add-rpaths-for-each-lib-dir-.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b0e5390d0b2add2eb33496dc465e0ab360995d15 Mon Sep 17 00:00:00 2001 -From: Ekaitz Zarraga -Date: Fri, 17 Nov 2023 23:20:58 +0100 -Subject: [PATCH] Revert "Never implicitly add rpaths for each lib dir, add - NixOS libdir to rpath" - -This reverts commit 6fd7c2993044b2f6f43af1c640c11be22eca426c. ---- - lib/std/zig/system/NativePaths.zig | 1 - - src/Compilation.zig | 2 +- - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/lib/std/zig/system/NativePaths.zig b/lib/std/zig/system/NativePaths.zig -index 4c8f1286b..cfa567f4b 100644 ---- a/lib/std/zig/system/NativePaths.zig -+++ b/lib/std/zig/system/NativePaths.zig -@@ -61,7 +61,6 @@ pub fn detect(arena: Allocator, native_info: NativeTargetInfo) !NativePaths { - } else if (word.len > 2 and word[0] == '-' and word[1] == 'L') { - const lib_path = word[2..]; - try self.addLibDir(lib_path); -- try self.addRPath(lib_path); - } else { - try self.addWarningFmt("Unrecognized C flag from NIX_LDFLAGS: {s}", .{word}); - break; -diff --git a/src/Compilation.zig b/src/Compilation.zig -index a08c3e09f..1c73f8467 100644 ---- a/src/Compilation.zig -+++ b/src/Compilation.zig -@@ -1542,7 +1542,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation { - .llvm_cpu_features = llvm_cpu_features, - .skip_linker_dependencies = options.skip_linker_dependencies, - .parent_compilation_link_libc = options.parent_compilation_link_libc, -- .each_lib_rpath = options.each_lib_rpath orelse false, -+ .each_lib_rpath = options.each_lib_rpath orelse options.is_native_os, - .build_id = build_id, - .cache_mode = cache_mode, - .disable_lld_caching = options.disable_lld_caching or cache_mode == .whole, --- -2.41.0 - -- cgit v1.2.3