Add support for rpath with pkg-config #20449
Conversation
lib/std/Build/Step/Compile.zig
Outdated
| @@ -741,6 +741,8 @@ fn runPkgConfig(compile: *Compile, lib_name: []const u8) !PkgConfigResult { | |||
| try zig_cflags.appendSlice(&[_][]const u8{ "-D", macro }); | |||
| } else if (mem.startsWith(u8, arg, "-D")) { | |||
| try zig_cflags.append(arg); | |||
| } else if (mem.startsWith(u8, arg, "-Wl,-rpath,")) { | |||
| try zig_cflags.appendSlice(&[_][]const u8{ "-rpath", arg[11..] }); | |||
There was a problem hiding this comment.
imo "-Wl,-rpath,".len would read better than a magic number 11.
Even better would be const wl_rpath_arg_prefix = "-Wl,-rpath,"; and using that constant in both places.
There was a problem hiding this comment.
Yep, you're right. I've also cleaned up the stray commit from my previous PR
ikskuh
force-pushed
the
add_pkg_config_rpath_support
branch
2 times, most recently
from
b996a3e
to
3745f50
Compare
… support for NixOS linking.
ikskuh
force-pushed
the
add_pkg_config_rpath_support
branch
from
3745f50
to
902f669
Compare
| @@ -741,6 +743,8 @@ fn runPkgConfig(compile: *Compile, lib_name: []const u8) !PkgConfigResult { | |||
| try zig_cflags.appendSlice(&[_][]const u8{ "-D", macro }); | |||
| } else if (mem.startsWith(u8, arg, "-D")) { | |||
| try zig_cflags.append(arg); | |||
| } else if (mem.startsWith(u8, arg, wl_rpath_prefix)) { | |||
| try zig_cflags.appendSlice(&[_][]const u8{ "-rpath", arg[wl_rpath_prefix.len..] }); | |||
There was a problem hiding this comment.
hmm, this should use the compile.addRPath API instead of C flags I think.
There was a problem hiding this comment.
very reasonable, i'll fix it
There was a problem hiding this comment.
@andrewrk: This is basically doing exactly the same as addRPath, which is appending -rpath in appendZigProcessFlags as well.
If we would be using addRPath , we'd need to run the pkg-config during the configure phase instead of the build phase, which would be weird, as we'd run it twice then
Right now,
pkg-configcan output-Wl,-rpath,…which is ignored by the parser.On NixOS,
rpathis an important concept for linking system libraries, especially when they are not the "native" library (x86 on x86_64).This patch should fix this by configuring the Zig linker such that it respects these
rpathrequirements