mirror of https://github.com/postgres/postgres
Only define NO_THREAD_SAFE_LOCALE for MSVC plperl when required
Latest versions of Strawberry Perl define USE_THREAD_SAFE_LOCALE, and we therefore get a handshake error when building against such instances. The solution is to perform a test to see if USE_THREAD_SAFE_LOCALE is defined and only define NO_THREAD_SAFE_LOCALE if it isn't. Backpatch the meson.build fix back to release 16 and apply the same logic to Mkvcbuild.pm in releases 12 through 16. Original report of the issue from Muralikrishna Bandaru.
This commit is contained in:
parent
4e7b9a1adc
commit
648397b1d4
|
@ -1054,7 +1054,10 @@ if not perlopt.disabled()
|
|||
if cc.get_id() == 'msvc'
|
||||
# prevent binary mismatch between MSVC built plperl and Strawberry or
|
||||
# msys ucrt perl libraries
|
||||
perl_ccflags += ['-DNO_THREAD_SAFE_LOCALE']
|
||||
perl_v = run_command(perl, '-V').stdout()
|
||||
if not perl_v.contains('USE_THREAD_SAFE_LOCALE')
|
||||
perl_ccflags += ['-DNO_THREAD_SAFE_LOCALE']
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue