From 5f0a252faeb70fae1444417d249f26ec73bc9fd9 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Fri, 20 Dec 2019 16:37:48 +0000 Subject: [PATCH] On non Linux systems, (g)make distrib stops halfway because of QEMU not supported. Symplifying cores counting data gathering. --- qemu_mode/build_qemu_support.sh | 2 +- unicorn_mode/build_unicorn_support.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qemu_mode/build_qemu_support.sh b/qemu_mode/build_qemu_support.sh index afd82f72..9da51cfd 100755 --- a/qemu_mode/build_qemu_support.sh +++ b/qemu_mode/build_qemu_support.sh @@ -44,7 +44,7 @@ echo "[*] Performing basic sanity checks..." if [ ! "`uname -s`" = "Linux" ]; then echo "[-] Error: QEMU instrumentation is supported only on Linux." - exit 1 + exit 0 fi diff --git a/unicorn_mode/build_unicorn_support.sh b/unicorn_mode/build_unicorn_support.sh index 1c176bca..e46cf54f 100755 --- a/unicorn_mode/build_unicorn_support.sh +++ b/unicorn_mode/build_unicorn_support.sh @@ -73,19 +73,19 @@ if [ "$PLT" = "Linux" ]; then fi if [ "$PLT" = "Darwin" ]; then - CORES=`sysctl hw.ncpu | cut -d' ' -f2` + CORES=`sysctl -n hw.ncpu` TARCMD=tar fi if [ "$PLT" = "FreeBSD" ]; then MAKECMD=gmake - CORES=`sysctl hw.ncpu | cut -d' ' -f2` + CORES=`sysctl -n hw.ncpu` TARCMD=gtar fi if [ "$PLT" = "NetBSD" ] || [ "$PLT" = "OpenBSD" ]; then MAKECMD=gmake - CORES=`sysctl hw.ncpu | cut -d'=' -f2` + CORES=`sysctl -n hw.ncpu` TARCMD=gtar fi