diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5172e15ca..7b178b69c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,7 +90,7 @@ pkg_macOS: stage: pkg script: - ln -s ~/tarballs macOS/deps/ - - make -C macOS + - arch -x86_64 make -C macOS cache: key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" paths: diff --git a/macOS/build.sh b/macOS/build.sh index 6725043ea..8be5b5551 100755 --- a/macOS/build.sh +++ b/macOS/build.sh @@ -29,7 +29,7 @@ CC=gcc-$GCC_VERSION CXX=g++-$GCC_VERSION # Set the number of threads -NTHREADS=$(nproc) +NTHREADS=$(sysctl -n hw.ncpu) # Set dependency directory LIB64="$ROOTDIR"/macOS/deps/lib64 @@ -168,7 +168,7 @@ make clean --with-gsl="$LIB64"/gsl \ --with-matio="$LIB64"/matio \ --with-slicot="$LIB64"/Slicot/with-underscore \ - --with-matlab=/Applications/MATLAB_R2019b.app + --with-matlab=/Applications/MATLAB_R2022b.app make -j"$NTHREADS" cp -L "$ROOTDIR"/mex/matlab/* "$PKGFILES"/mex/matlab/maci64-9.4-9.13 diff --git a/preprocessor b/preprocessor index 715ec9e4b..df7144525 160000 --- a/preprocessor +++ b/preprocessor @@ -1 +1 @@ -Subproject commit 715ec9e4bc681bf2e1d5236d0dc4098212ddf9e6 +Subproject commit df7144525d47489493590b062ee8cde9b9b5170e