Skip to content

Commit c61c0cb

Browse files
committed
meson: Fix import library name in Windows
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>
1 parent 832dc19 commit c61c0cb

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

meson.build

+3-3
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ if host_system == 'cygwin'
201201
cppflags += '-D_GNU_SOURCE'
202202
dlsuffix = '.dll'
203203
mod_link_args_fmt = ['@0@']
204-
mod_link_with_name = 'lib@0@.exe.a'
204+
mod_link_with_name = 'lib@0@.a'
205205
mod_link_with_dir = 'libdir'
206206

207207
elif host_system == 'darwin'
@@ -273,10 +273,10 @@ elif host_system == 'windows'
273273
export_file_suffix = 'def'
274274
if cc.get_id() == 'msvc'
275275
export_fmt = '/DEF:@0@'
276-
mod_link_with_name = '@0@.exe.lib'
276+
mod_link_with_name = '@0@.lib'
277277
else
278278
export_fmt = '@0@'
279-
mod_link_with_name = 'lib@0@.exe.a'
279+
mod_link_with_name = 'lib@0@.a'
280280
endif
281281
mod_link_args_fmt = ['@0@']
282282
mod_link_with_dir = 'libdir'

src/backend/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ postgres = executable('postgres',
133133
link_with: backend_link_with,
134134
link_depends: backend_link_depends,
135135
export_dynamic: true,
136-
implib: true,
136+
implib: 'postgres',
137137
dependencies: backend_build_deps,
138138
kwargs: default_bin_args,
139139
)

0 commit comments

Comments
 (0)