From 05d38ad11f159c1227b7f06b9ce879e3120eea5a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 12 Jul 2020 13:22:32 +0200 Subject: [PATCH] Pass -j instead to cmake for Android - more portable --- libretro-buildbot-recipe.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index ee925c4c..66e1af58 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -454,7 +454,7 @@ build_libretro_android_cmake() { PLATFORM="$5" ARGS="$6" - JOBS_FLAG=--parallel + JOBS_FLAG=-j EXTRAARGS="-DANDROID_PLATFORM=android-${API_LEVEL} -DCMAKE_TOOLCHAIN_FILE=${NDK_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_STL=c++_static" if [ -n "NDK_CCACHE" ]; then @@ -487,8 +487,8 @@ build_libretro_android_cmake() { echo "BUILD CMD: ${CMAKE} $*" 2>&1 | tee -a "$LOGFILE" echo "$@" ../.. | xargs ${CMAKE} 2>&1 | tee -a "$LOGFILE" - echo "BUILD CMD: ${CMAKE} --build . ${JOBS_FLAG} ${JOBS} --target ${NAME}_libretro --config Release --" 2>&1 | tee -a "$LOGFILE" - ${CMAKE} --build . ${JOBS_FLAG} ${JOBS} --target ${NAME}_libretro --config Release -- 2>&1 | tee -a "$LOGFILE" + echo "BUILD CMD: ${CMAKE} --build . --target ${NAME}_libretro --config Release -- ${JOBS_FLAG} ${JOBS} " 2>&1 | tee -a "$LOGFILE" + ${CMAKE} --build . --target ${NAME}_libretro --config Release -- ${JOBS_FLAG} ${JOBS} 2>&1 | tee -a "$LOGFILE" COREPATH=$(find . -type f -name ${CORENAM}) if [ -n "${COREPATH}" ]; then