Skip to content

Commit 9c3b017

Browse files
committed
win+Meson: do allow linking with the Rust-built xdiff
When linking against the Rust-built `xdiff`, there is now a new required dependency: Without _also_ linking to the system library `userenv`, the compile would fail with this error message: xdiff.lib(std-c85e9beb7923f636.std.df32d1bc89881d89-cgu.0.rcgu.o) : error LNK2019: unresolved external symbol __imp_GetUserProfileDirectoryW referenced in function _ZN3std3env8home_dir17hfd1c3b6676cd78f6E Therefore, just like we do in case of Makefile-based builds on Windows, we now also link to that library when building with Meson. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent ef6e439 commit 9c3b017

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,6 +1260,7 @@ elif host_machine.system() == 'windows'
12601260
]
12611261

12621262
libgit_dependencies += compiler.find_library('ntdll')
1263+
libgit_dependencies += compiler.find_library('userenv')
12631264
libgit_include_directories += 'compat/win32'
12641265
if compiler.get_id() == 'msvc'
12651266
libgit_include_directories += 'compat/vcbuild/include'

0 commit comments

Comments
 (0)