luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-26 17:16:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/smcv/cross-ld' into 'master'

Browse Source 
Make ld executable configurable

See merge request GNOME/glib!1209
This commit is contained in:
Philip Withnall 2019-11-04 16:26:24 +00:00
commit 4d65f32703
4 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/android-setup-env.sh
View File

@ -95,6 +95,7 @@ c_link_args = ['-L${prefix_path}/lib64',
c = '${toolchain_path}/bin/${CC}' c = '${toolchain_path}/bin/${CC}'
cpp = '${toolchain_path}/bin/${CXX}' cpp = '${toolchain_path}/bin/${CXX}'
ar = '${toolchain_path}/bin/${AR}' ar = '${toolchain_path}/bin/${AR}'
ld = '${toolchain_path}/bin/${LD}'
strip = '${toolchain_path}/bin/${STRIP}' strip = '${toolchain_path}/bin/${STRIP}'
pkgconfig = '${PKG_CONFIG}' pkgconfig = '${PKG_CONFIG}'
EOM EOM

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'
ld = 'x86_64-w64-mingw32-ld'
objcopy = 'x86_64-w64-mingw32-objcopy' 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'

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'
ld = 'x86_64-w64-mingw32-ld'
objcopy = 'x86_64-w64-mingw32-objcopy' 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'

5
gio/tests/meson.build
View File

@ -586,8 +586,9 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
# (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.
objcopy = find_program('objcopy', required : false) objcopy = find_program('objcopy', required : false)
ld = find_program('ld', required : false)
if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() and ld.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 +617,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
test_resources_binary = custom_target('test_resources.o', test_resources_binary = custom_target('test_resources.o',
input : test_gresource_binary, input : test_gresource_binary,
output : 'test_resources.o', output : 'test_resources.o',
command : ['ld', command : [ld,
'-r', '-r',
'-b','binary', '-b','binary',
'@INPUT@', '@INPUT@',