summaryrefslogtreecommitdiff
path: root/.gitlab-ci/android-setup-env.sh
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2019-11-04 10:24:15 +0000
committerSimon McVittie <smcv@collabora.com>2019-11-04 15:08:33 +0000
commit81936ca5808ed7f52571e1fdc49ecffc4d202b07 (patch)
tree104f81891ab313d59fe9b8c56da8bc04f7f39726 /.gitlab-ci/android-setup-env.sh
parent6d8836515c21031e18164e59355d3a387f2221e2 (diff)
downloadglib-81936ca5808ed7f52571e1fdc49ecffc4d202b07.tar.gz
Make ld executable configurable
Tools like this should be configurable in a cross or native file. In particular, if we are cross-compiling (with an executable wrapper like qemu-arm), the build system ld is not necessarily able to manipulate host system objects. Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to '.gitlab-ci/android-setup-env.sh')
-rwxr-xr-x.gitlab-ci/android-setup-env.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitlab-ci/android-setup-env.sh b/.gitlab-ci/android-setup-env.sh
index 510056f66..d922bfdbe 100755
--- a/.gitlab-ci/android-setup-env.sh
+++ b/.gitlab-ci/android-setup-env.sh
@@ -95,6 +95,7 @@ c_link_args = ['-L${prefix_path}/lib64',
c = '${toolchain_path}/bin/${CC}'
cpp = '${toolchain_path}/bin/${CXX}'
ar = '${toolchain_path}/bin/${AR}'
+ld = '${toolchain_path}/bin/${LD}'
strip = '${toolchain_path}/bin/${STRIP}'
pkgconfig = '${PKG_CONFIG}'
EOM