luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-03 22:33:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/tests/meson.build
View File

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