[glib: 2/2] Merge branch 'wip/smcv/cross-ld' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 4d65f32703666329dea774ffe9302e8e35074ff2
Merge: f371b2a9d 81936ca58
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Nov 4 16:26:24 2019 +0000

    Merge branch 'wip/smcv/cross-ld' into 'master'
    
    Make ld executable configurable
    
    See merge request GNOME/glib!1209

 .gitlab-ci/android-setup-env.sh   | 1 +
 .gitlab-ci/cross_file_mingw64.txt | 1 +
 docs/reference/glib/cross.xml     | 1 +
 gio/tests/meson.build             | 5 +++--
 4 files changed, 6 insertions(+), 2 deletions(-)
---