File tree Expand file tree Collapse file tree 1 file changed +17
-8
lines changed
Expand file tree Collapse file tree 1 file changed +17
-8
lines changed Original file line number Diff line number Diff line change @@ -60,27 +60,36 @@ tests = [ 'plpgsql_check_active',
6060 ' plpgsql_check_active-' + pg_version_major.to_string(),
6161 ' plpgsql_check_passive-' + pg_version_major.to_string() ]
6262
63- compilerName = meson .get_compiler(' c' ).get_id( )
63+ compiler = meson .get_compiler(' c' )
6464
65- if meson .get_compiler(' c' ).get_id() == ' msvc'
65+ compiler_name = compiler.get_id()
66+ compiler_version = compiler.version()
67+
68+ if compiler_name == ' msvc'
6669 incdir = [includedir_server / ' port/win32_msvc' ,
6770 includedir_server / ' port/win32' ,
6871 includedir_server,
6972 includedir]
70- postgres_lib = meson .get_compiler(' c' ).find_library (
71- ' postgres' ,
72- dirs : libdir,
73- static : true ,
74- required : true
75- )
73+ postgres_lib = compiler.find_library ( ' postgres' ,
74+ dirs : libdir,
75+ static : true ,
76+ required : true )
7677else
7778 incdir = [ includedir_server ]
7879 postgres_lib = []
7980endif
8081
82+ if compiler_name == ' gcc' and compiler_version.startswith(' 15.' )
83+ # see issue 207
84+ cargs = [' -Wno-error=incompatible-pointer-types' , ' --no-warnings' ]
85+ else
86+ cargs = []
87+ endif
88+
8189module_lib = shared_module (
8290 module_name,
8391 sources,
92+ c_args : cargs,
8493 include_directories : incdir,
8594 install : true ,
8695 install_dir : pkglibdir,
You can’t perform that action at this time.
0 commit comments