diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2023-10-18 23:37:47 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2023-10-18 23:37:47 -0700 |
| commit | ae2cd5fe263e9d8ddd5719b4795f9cd39b5c0324 (patch) | |
| tree | 49058ce872193ded1dc4a3a37fe4c5295f1f18f9 /src/Compilation.zig | |
| parent | 470d887d801a982e4cd7ecfc5b0e736d92e8b414 (diff) | |
| download | zig-ae2cd5fe263e9d8ddd5719b4795f9cd39b5c0324.tar.gz zig-ae2cd5fe263e9d8ddd5719b4795f9cd39b5c0324.zip | |
Revert "Never implicitly add rpaths for each lib dir, add NixOS libdir to rpath"
This reverts commit d7b73af8f65bb891c8700ed47777144bb6f35fe1.
I did not look at this closely enough. This is incorrect; it should not
implicitly add rpaths for every library, and it should not disable the
nice default of each_lib_path when compiling for the native OS.
See #16062 where we are working on a follow-up improvement to this.
Diffstat (limited to 'src/Compilation.zig')
| -rw-r--r-- | src/Compilation.zig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Compilation.zig b/src/Compilation.zig index 8032e67943..84e0c512d1 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -1662,7 +1662,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, |