summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2020-05-22 10:05:48 +0100
committerDaniel Silverstone <dsilvers@digital-scurf.org>2020-05-22 10:05:48 +0100
commit8bef50aae2aaf4bb51900f638d9c4abb1e0b2304 (patch)
tree97c23d01729dae0701b1c42ad4c4b45b6a841df2 /docs
parentde56170cb99ad40ba72dc2bc864d095717521176 (diff)
downloadnetsurf-8bef50aae2aaf4bb51900f638d9c4abb1e0b2304.tar.gz
netsurf-8bef50aae2aaf4bb51900f638d9c4abb1e0b2304.tar.bz2
env.sh: Reorder to prefer cross env, and export that to build system
Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
Diffstat (limited to 'docs')
-rw-r--r--docs/env.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/docs/env.sh b/docs/env.sh
index 3b0f24927..690822036 100644
--- a/docs/env.sh
+++ b/docs/env.sh
@@ -198,7 +198,7 @@ if [ "x${HOST}" = "x" ]; then
HOST=${TARGET_ABI}
fi
else
- HOST_CC_LIST="${HOST}-cc ${HOST}-gcc /opt/netsurf/${HOST}/cross/bin/${HOST}-cc /opt/netsurf/${HOST}/cross/bin/${HOST}-gcc"
+ HOST_CC_LIST="/opt/netsurf/${HOST}/cross/bin/${HOST}-cc /opt/netsurf/${HOST}/cross/bin/${HOST}-gcc ${HOST}-cc ${HOST}-gcc"
for HOST_CC_V in $(echo ${HOST_CC_LIST});do
HOST_CC=$(${WHICH_CMD} ${HOST_CC_V})
if [ "x${HOST_CC}" != "x" ];then
@@ -213,9 +213,13 @@ else
HOST_CC_MACHINE=$(${HOST_CC} -dumpmachine 2>/dev/null)
if [ "${HOST_CC_MACHINE}" != "${HOST}" ];then
- echo "Compiler dumpmachine differes from HOST setting"
+ echo "Compiler dumpmachine differs from HOST setting"
return 2
fi
+
+ NS_ENV_CC="${HOST_CC}"
+ export NS_ENV_CC
+
unset HOST_CC_LIST HOST_CC_V HOST_CC HOST_CC_MACHINE
fi