luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 11:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix cross build error for Windows with gcc

Closes #2571

See merge request GNOME/glib!2416
This commit is contained in:
Philip Withnall 2022-01-06 12:08:36 +00:00
commit 2c958470d2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gio/tests/meson.build
View File

@ -734,11 +734,16 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
'-o','@OUTPUT@'])
# Rename symbol to match the one in the C file
if cc.get_id() == 'gcc' and host_system == 'windows'
underscore = '_'
else
underscore = ''
endif
test_resources_binary2 = custom_target('test_resources2.o',
input : test_resources_binary,
output : 'test_resources2.o',
command : [objcopy,
'--add-symbol','_g_binary_test1_resource_data=.data:0',
'--add-symbol', underscore + '_g_binary_test1_resource_data=.data:0',
'@INPUT@',
'@OUTPUT@'])