summaryrefslogtreecommitdiff
path: root/scripts/android_env.sh
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/android_env.sh')
-rwxr-xr-xscripts/android_env.sh16
1 files changed, 9 insertions, 7 deletions
diff --git a/scripts/android_env.sh b/scripts/android_env.sh
index f91d7628e5..93b1452a5a 100755
--- a/scripts/android_env.sh
+++ b/scripts/android_env.sh
@@ -7,17 +7,19 @@ set -o pipefail
export MASON_PLATFORM=android
+export PATH=`.mason/mason env PATH`
+
echo MASON_PLATFORM=\"android\"
echo MASON_ANDROID_ABI=\"${MASON_ANDROID_ABI}\"
-echo CXX=\"`.mason/mason env CXX`\"
-echo CC=\"`.mason/mason env CC`\"
-echo LD=\"`.mason/mason env LD`\"
-echo LINK=\"`.mason/mason env CXX`\"
-echo AR=\"`.mason/mason env AR`\"
-echo RANLIB=\"`.mason/mason env RANLIB`\"
+echo CXX=\"`which $(.mason/mason env CXX)`\"
+echo CC=\"`which $(.mason/mason env CC)`\"
+echo LD=\"`which $(.mason/mason env LD)`\"
+echo LINK=\"`which $(.mason/mason env CXX)`\"
+echo AR=\"`which $(.mason/mason env AR)`\"
+echo RANLIB=\"`which $(.mason/mason env RANLIB)`\"
+echo STRIP=\"`which $(.mason/mason env STRIP)`\"
echo LDFLAGS=\"`.mason/mason env LDFLAGS` ${LDFLAGS}\"
echo CFLAGS=\"`.mason/mason env CFLAGS` ${CFLAGS}\"
echo CPPFLAGS=\"`.mason/mason env CPPFLAGS` ${CPPFLAGS}\"
-echo PATH=\"`.mason/mason env PATH`\"
echo JNIDIR=\"`.mason/mason env JNIDIR`\"