luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-22 21:40:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1916-objcopy-cross-compilation' into 'master'

Browse Source 
tests: Use objcopy from the cross-compilation file, if configured

Closes #1916

See merge request GNOME/glib!1188
This commit is contained in:
Simon McVittie 2019-10-28 20:06:50 +00:00
commit 61f693fb21
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci/cross_file_mingw64.txt
View File

@ -12,6 +12,7 @@ c_link_args = []
c = 'x86_64-w64-mingw32-gcc' c = 'x86_64-w64-mingw32-gcc'
cpp = 'x86_64-w64-mingw32-g++' cpp = 'x86_64-w64-mingw32-g++'
ar = 'x86_64-w64-mingw32-ar' ar = 'x86_64-w64-mingw32-ar'
objcopy = 'x86_64-w64-mingw32-objcopy'
strip = 'x86_64-w64-mingw32-strip' strip = 'x86_64-w64-mingw32-strip'
pkgconfig = 'x86_64-w64-mingw32-pkg-config' pkgconfig = 'x86_64-w64-mingw32-pkg-config'
windres = 'x86_64-w64-mingw32-windres' windres = 'x86_64-w64-mingw32-windres'

1
docs/reference/glib/cross.xml
View File

@ -59,6 +59,7 @@ c_link_args = []
c = 'x86_64-w64-mingw32-gcc' c = 'x86_64-w64-mingw32-gcc'
cpp = 'x86_64-w64-mingw32-g++' cpp = 'x86_64-w64-mingw32-g++'
ar = 'x86_64-w64-mingw32-ar' ar = 'x86_64-w64-mingw32-ar'
objcopy = 'x86_64-w64-mingw32-objcopy'
strip = 'x86_64-w64-mingw32-strip' strip = 'x86_64-w64-mingw32-strip'
pkgconfig = 'x86_64-w64-mingw32-pkg-config' pkgconfig = 'x86_64-w64-mingw32-pkg-config'
windres = 'x86_64-w64-mingw32-windres' windres = 'x86_64-w64-mingw32-windres'

6
gio/tests/meson.build
View File

@ -577,7 +577,9 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
# Support for --add-symbol was added to LLVM objcopy in 2019 # Support for --add-symbol was added to LLVM objcopy in 2019
# (https://reviews.llvm.org/D58234). FIXME: This test could be enabled for # (https://reviews.llvm.org/D58234). FIXME: This test could be enabled for
# LLVM once that support is in a stable release. # LLVM once that support is in a stable release.
if build_machine.system() == 'linux' and cc.get_id() == 'gcc' objcopy = find_program('objcopy', required : false)
if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found()
test_gresource_binary = custom_target('test5.gresource', test_gresource_binary = custom_target('test5.gresource',
input : 'test5.gresource.xml', input : 'test5.gresource.xml',
output : 'test5.gresource', output : 'test5.gresource',
@ -616,7 +618,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
test_resources_binary2 = custom_target('test_resources2.o', test_resources_binary2 = custom_target('test_resources2.o',
input : test_resources_binary, input : test_resources_binary,
output : 'test_resources2.o', output : 'test_resources2.o',
command : ['objcopy', command : [objcopy,
'--add-symbol','_g_binary_test1_resource_data=.data:0', '--add-symbol','_g_binary_test1_resource_data=.data:0',
'@INPUT@', '@INPUT@',
'@OUTPUT@']) '@OUTPUT@'])