diff options
| author | horstderheld | 2021-11-07 03:03:57 +0100 |
|---|---|---|
| committer | horstderheld | 2021-11-07 03:03:57 +0100 |
| commit | 20cca31c14833293ac9f7a2c0b7c714c4d806148 (patch) | |
| tree | 7e356dc417b6afd76ee5aa4e1d30bb9130924d2e /install.patch | |
| parent | 9c7562170280ed6768c0d754fc88320f91697069 (diff) | |
| download | aur-20cca31c14833293ac9f7a2c0b7c714c4d806148.tar.gz | |
cleanup, automate variables, add MAKEFLAGS to build script
Diffstat (limited to 'install.patch')
| -rw-r--r-- | install.patch | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/install.patch b/install.patch index 7e48da5cea63..467ba289f895 100644 --- a/install.patch +++ b/install.patch @@ -1,15 +1,4 @@ -@@ -4,7 +4,9 @@ - set -e - set -x - --if [ "$(uname)" = "Darwin" ]; then -+if [[ ! -z "MAKEFLAGS" ]]; then -+ JOBS="${MAKEFLAGS:2}" -+elif [ "$(uname)" = "Darwin" ]; then - num_cpus=$(sysctl -n hw.ncpu) - : "${JOBS:=$num_cpus}" - else -@@ -30,7 +32,7 @@ +@@ -30,7 +30,7 @@ SRCDIR=$1 OUTDIR=$2 @@ -18,7 +7,7 @@ if [ "$(uname)" = "Darwin" ]; then COMMON_OPTIONS="${COMMON_OPTIONS} -DCMAKE_OSX_DEPLOYMENT_TARGET='10.9'" elif [ "$(uname)" != "Linux" ]; then -@@ -41,9 +43,9 @@ +@@ -41,9 +41,9 @@ COMMON_OPTIONS="${COMMON_OPTIONS} -DVERSION_SUFFIX=$3" fi @@ -31,7 +20,7 @@ cmake ${COMMON_OPTIONS} -DPCB=X9LITE ${SRCDIR} make -j${JOBS} libsimulator -@@ -128,13 +130,3 @@ +@@ -128,13 +128,3 @@ cmake ${COMMON_OPTIONS} -DPCB=X12S ${SRCDIR} make -j${JOBS} libsimulator |