cleanup makefiles

This commit is contained in:
Konstantin Käfer
2015-02-03 16:18:37 +01:00
parent f007c420ed
commit 73f7db9af2
21 changed files with 270 additions and 238 deletions

View File

@@ -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`\"

View File

@@ -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