diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-02-03 16:18:37 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-02-04 11:54:01 +0100 |
| commit | 73f7db9af2f76593856d64349a376412d292cd15 (patch) | |
| tree | db311e489246d41e6386f4c8bcc14da17e634c66 /scripts | |
| parent | f007c420ed4e2eadaedbbdd1c29912c6c8142fa1 (diff) | |
| download | qtlocation-mapboxgl-73f7db9af2f76593856d64349a376412d292cd15.tar.gz | |
cleanup makefiles
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/android_env.sh | 16 | ||||
| -rwxr-xr-x | scripts/run_tests.sh | 5 |
2 files changed, 13 insertions, 8 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`\" diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh index 6a715f3783..e4c9e77eac 100755 --- a/scripts/run_tests.sh +++ b/scripts/run_tests.sh @@ -3,7 +3,10 @@ set -e set -o pipefail -CMD="build/${BUILDTYPE:-Release}/test" +if [ `uname -s` = 'Darwin' ]; then HOST=${HOST:-osx} ; else HOST=${HOST:-linux} ; fi + +CMD=$1 +shift # allow writing core files ulimit -c unlimited -S |