From d7b73af8f65bb891c8700ed47777144bb6f35fe1 Mon Sep 17 00:00:00 2001 From: Jan200101 Date: Wed, 7 Jun 2023 12:44:27 +0200 Subject: [PATCH] Never implicitly add rpaths for each lib dir, add NixOS libdir to rpath --- lib/std/zig/system/NativePaths.zig | 1 + src/Compilation.zig | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/std/zig/system/NativePaths.zig b/lib/std/zig/system/NativePaths.zig index e0df225c88..f9798695ad 100644 --- a/lib/std/zig/system/NativePaths.zig +++ b/lib/std/zig/system/NativePaths.zig @@ -74,6 +74,7 @@ pub fn detect(allocator: 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 9397bc93a9..662dcdc408 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -1521,7 +1521,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 options.is_native_os, + .each_lib_rpath = options.each_lib_rpath orelse false, .build_id = build_id, .cache_mode = cache_mode, .disable_lld_caching = options.disable_lld_caching or cache_mode == .whole,