Merge branch 'gcc-build-fix' into 'main'

gio: Fix multiple definition error with tests

Closes #2966

See merge request GNOME/glib!3368
This commit is contained in:
Philip Withnall 2023-04-11 11:31:37 +00:00
commit 718b5d5cd3

View File

@ -929,7 +929,7 @@ if not meson.is_cross_build()
input : test_gresource_binary,
output : 'test_resources.o',
command : cc.cmd_array() + ['-Wl,-z,noexecstack', '-r', '-Wl,-b,binary',
'@INPUT@', '-o','@OUTPUT@'])
'-nostdlib', '@INPUT@', '-o','@OUTPUT@'])
# Rename symbol to match the one in the C file
if cc.get_id() == 'gcc' and host_system == 'windows'