Detect cpu logical cores

robertying · May 30, 2021 · 1d3d85a · 1d3d85a
1 parent 1e8c355
commit 1d3d85a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/build-curl.sh b/build-curl.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    export CORES=$((`sysctl -n hw.logicalcpu`+1))
+else
+    export CORES=$((`nproc`+1))
+fi
+
 export TOOLCHAIN=$NDK/toolchains/llvm/prebuilt/$HOST_TAG
 
 # curl common configuration arguments
@@ -28,9 +34,9 @@ export SSL_DIR=$PWD/../openssl/build/$ANDROID_ARCH
 ./configure --host=$TARGET_HOST \
             --target=$TARGET_HOST \
             --prefix=$PWD/build/$ANDROID_ARCH \
-            --with-ssl=$SSL_DIR $ARGUMENTS
+            --with-openssl=$SSL_DIR $ARGUMENTS
 
-make -j5
+make -j$CORES
 make install
 make clean
 mkdir -p ../build/curl/$ANDROID_ARCH
@@ -53,9 +59,9 @@ export SSL_DIR=$PWD/../openssl/build/$ANDROID_ARCH
 ./configure --host=$TARGET_HOST \
             --target=$TARGET_HOST \
             --prefix=$PWD/build/$ANDROID_ARCH \
-            --with-ssl=$SSL_DIR $ARGUMENTS
+            --with-openssl=$SSL_DIR $ARGUMENTS
 
-make -j5
+make -j$CORES
 make install
 make clean
 mkdir -p ../build/curl/$ANDROID_ARCH
@@ -76,9 +82,9 @@ export SSL_DIR=$PWD/../openssl/build/$ANDROID_ARCH
 ./configure --host=$TARGET_HOST \
             --target=$TARGET_HOST \
             --prefix=$PWD/build/$ANDROID_ARCH \
-            --with-ssl=$SSL_DIR $ARGUMENTS
+            --with-openssl=$SSL_DIR $ARGUMENTS
 
-make -j5
+make -j$CORES
 make install
 make clean
 mkdir -p ../build/curl/$ANDROID_ARCH
@@ -99,9 +105,9 @@ export SSL_DIR=$PWD/../openssl/build/$ANDROID_ARCH
 ./configure --host=$TARGET_HOST \
             --target=$TARGET_HOST \
             --prefix=$PWD/build/$ANDROID_ARCH \
-            --with-ssl=$SSL_DIR $ARGUMENTS
+            --with-openssl=$SSL_DIR $ARGUMENTS
 
-make -j5
+make -j$CORES
 make install
 make clean
 mkdir -p ../build/curl/$ANDROID_ARCH

diff --git a/build-openssl.sh b/build-openssl.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    export CORES=$((`sysctl -n hw.logicalcpu`+1))
+else
+    export CORES=$((`nproc`+1))
+fi
+
 export TOOLCHAIN=$NDK/toolchains/llvm/prebuilt/$HOST_TAG
 
 # openssl refers to the host specific toolchain as "ANDROID_NDK_HOME"
@@ -20,7 +26,7 @@ ln -sfn $TOOLCHAIN/bin/$TARGET_HOST$MIN_SDK_VERSION-clang $TOOLCHAIN/bin/$TARGET
  -D__ANDROID_API__=$MIN_SDK_VERSION \
  --prefix=$PWD/build/$ANDROID_ARCH
 
-make -j5
+make -j$CORES
 make install_sw
 make clean
 mkdir -p ../build/openssl/$ANDROID_ARCH
@@ -37,7 +43,7 @@ ln -sfn $TOOLCHAIN/bin/armv7a-linux-androideabi$MIN_SDK_VERSION-clang $TOOLCHAIN
  -D__ANDROID_API__=$MIN_SDK_VERSION \
  --prefix=$PWD/build/$ANDROID_ARCH
 
-make -j5
+make -j$CORES
 make install_sw
 make clean
 mkdir -p ../build/openssl/$ANDROID_ARCH
@@ -53,7 +59,7 @@ ln -sfn $TOOLCHAIN/bin/$TARGET_HOST$MIN_SDK_VERSION-clang $TOOLCHAIN/bin/$TARGET
  -D__ANDROID_API__=$MIN_SDK_VERSION \
  --prefix=$PWD/build/$ANDROID_ARCH
 
-make -j5
+make -j$CORES
 make install_sw
 make clean
 mkdir -p ../build/openssl/$ANDROID_ARCH
@@ -69,7 +75,7 @@ ln -sfn $TOOLCHAIN/bin/$TARGET_HOST$MIN_SDK_VERSION-clang $TOOLCHAIN/bin/$TARGET
  -D__ANDROID_API__=$MIN_SDK_VERSION \
  --prefix=$PWD/build/$ANDROID_ARCH
 
-make -j5
+make -j$CORES
 make install_sw
 make clean
 mkdir -p ../build/openssl/$ANDROID_ARCH