提交 be867174 编写于 作者: R Riku Ayanokoji 提交者: Zhang Rui

fix parallel make on osx

Signed-off-by: NZhang Rui <bbcallen@gmail.com>
上级 413ce9da
...@@ -26,12 +26,13 @@ REQUEST_SUB_CMD=$2 ...@@ -26,12 +26,13 @@ REQUEST_SUB_CMD=$2
ACT_ABI_32="armv5 armv7a x86" ACT_ABI_32="armv5 armv7a x86"
ACT_ABI_64="armv5 armv7a arm64 x86 x86_64" ACT_ABI_64="armv5 armv7a arm64 x86 x86_64"
ACT_ABI_ALL=$ALL_ABI_64 ACT_ABI_ALL=$ALL_ABI_64
UNAME_S=$(uname -s)
FF_MAKEFLAGS= FF_MAKEFLAGS=
if which nproc >/dev/null if which nproc >/dev/null
then then
FF_MAKEFLAGS=-j`nproc` FF_MAKEFLAGS=-j`nproc`
elif [ "$UNAMES" = "Darwin" ] && which sysctl >/dev/null elif [ "$UNAME_S" = "Darwin" ] && which sysctl >/dev/null
then then
FF_MAKEFLAGS=-j`sysctl -n machdep.cpu.thread_count` FF_MAKEFLAGS=-j`sysctl -n machdep.cpu.thread_count`
fi fi
......
...@@ -217,7 +217,7 @@ FF_MAKEFLAGS= ...@@ -217,7 +217,7 @@ FF_MAKEFLAGS=
if which nproc >/dev/null if which nproc >/dev/null
then then
FF_MAKEFLAGS=-j`nproc` FF_MAKEFLAGS=-j`nproc`
elif [ "$UNAMES" = "Darwin" ] && which sysctl >/dev/null elif [ "$UNAME_S" = "Darwin" ] && which sysctl >/dev/null
then then
FF_MAKEFLAGS=-j`sysctl -n machdep.cpu.thread_count` FF_MAKEFLAGS=-j`sysctl -n machdep.cpu.thread_count`
fi fi
......
...@@ -117,9 +117,9 @@ mkdir -p $FF_SYSROOT ...@@ -117,9 +117,9 @@ mkdir -p $FF_SYSROOT
echo "\n--------------------" echo "\n--------------------"
echo "[*] make NDK standalone toolchain" echo "[*] make NDK standalone toolchain"
echo "--------------------" echo "--------------------"
UNAMES=$(uname -s) UNAME_S=$(uname -s)
FF_MAKE_TOOLCHAIN_FLAGS="--install-dir=$FF_TOOLCHAIN_PATH" FF_MAKE_TOOLCHAIN_FLAGS="--install-dir=$FF_TOOLCHAIN_PATH"
if [ "$UNAMES" = "Darwin" ]; then if [ "$UNAME_S" = "Darwin" ]; then
echo "build on darwin-x86_64" echo "build on darwin-x86_64"
FF_MAKE_TOOLCHAIN_FLAGS="$FF_MAKE_TOOLCHAIN_FLAGS --system=darwin-x86_64" FF_MAKE_TOOLCHAIN_FLAGS="$FF_MAKE_TOOLCHAIN_FLAGS --system=darwin-x86_64"
FF_MAKE_FLAG=-j`sysctl -n machdep.cpu.thread_count` FF_MAKE_FLAG=-j`sysctl -n machdep.cpu.thread_count`
...@@ -129,7 +129,7 @@ FF_MAKEFLAGS= ...@@ -129,7 +129,7 @@ FF_MAKEFLAGS=
if which nproc >/dev/null if which nproc >/dev/null
then then
FF_MAKEFLAGS=-j`nproc` FF_MAKEFLAGS=-j`nproc`
elif [ "$UNAMES" = "Darwin" ] && which sysctl >/dev/null elif [ "$UNAME_S" = "Darwin" ] && which sysctl >/dev/null
then then
FF_MAKEFLAGS=-j`sysctl -n machdep.cpu.thread_count` FF_MAKEFLAGS=-j`sysctl -n machdep.cpu.thread_count`
fi fi
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册