mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: Fix import library name in Windows

Browse Source 
This changes the import library name from 'postgres.exe.lib' to
'postgres.lib', which is what it was with the old MSVC build system.
Extension builds use that name.

Bug: #18513
Reported-by: Muralikrishna Bandaru <muralikrishna.bandaru@enterprisedb.com>
This commit is contained in:
Peter Eisentraut 2024-06-20 08:09:28 +02:00
parent 832dc19ea6
commit c61c0cb3a9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@ -201,7 +201,7 @@ if host_system == 'cygwin'
cppflags += '-D_GNU_SOURCE' cppflags += '-D_GNU_SOURCE'
dlsuffix = '.dll' dlsuffix = '.dll'
mod_link_args_fmt = ['@0@'] mod_link_args_fmt = ['@0@']
mod_link_with_name = 'lib@0@.exe.a' mod_link_with_name = 'lib@0@.a'
mod_link_with_dir = 'libdir' mod_link_with_dir = 'libdir'
elif host_system == 'darwin' elif host_system == 'darwin'
@ -273,10 +273,10 @@ elif host_system == 'windows'
export_file_suffix = 'def' export_file_suffix = 'def'
if cc.get_id() == 'msvc' if cc.get_id() == 'msvc'
export_fmt = '/DEF:@0@' export_fmt = '/DEF:@0@'
mod_link_with_name = '@0@.exe.lib' mod_link_with_name = '@0@.lib'
else else
export_fmt = '@0@' export_fmt = '@0@'
mod_link_with_name = 'lib@0@.exe.a' mod_link_with_name = 'lib@0@.a'
endif endif
mod_link_args_fmt = ['@0@'] mod_link_args_fmt = ['@0@']
mod_link_with_dir = 'libdir' mod_link_with_dir = 'libdir'

2
src/backend/meson.build
View File

@ -133,7 +133,7 @@ postgres = executable('postgres',
link_with: backend_link_with, link_with: backend_link_with,
link_depends: backend_link_depends, link_depends: backend_link_depends,
export_dynamic: true, export_dynamic: true,
implib: true, implib: 'postgres',
dependencies: backend_build_deps, dependencies: backend_build_deps,
kwargs: default_bin_args, kwargs: default_bin_args,
) )