Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/8bef50aae2aaf4bb51900f638d9c4abb1e0b2304
...commit
http://git.netsurf-browser.org/netsurf.git/commit/8bef50aae2aaf4bb51900f638d9c4abb1e0b2304
...tree
http://git.netsurf-browser.org/netsurf.git/tree/8bef50aae2aaf4bb51900f638d9c4abb1e0b2304
The branch, master has been updated
via 8bef50aae2aaf4bb51900f638d9c4abb1e0b2304 (commit)
from de56170cb99ad40ba72dc2bc864d095717521176 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=8bef50aae2aaf4bb51900f638d9c4abb1e0b2304
commit 8bef50aae2aaf4bb51900f638d9c4abb1e0b2304
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
env.sh: Reorder to prefer cross env, and export that to build system
Signed-off-by: Daniel Silverstone <[email protected]>
diff --git a/docs/env.sh b/docs/env.sh
index 3b0f249..6908220 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
-----------------------------------------------------------------------
Summary of changes:
docs/env.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/docs/env.sh b/docs/env.sh
index 3b0f249..6908220 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
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
