diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 606e9a18da1bc3a8fe8cb11ab20656a9982737b6..085881d666aa47baf1a8444a183d94e675918f34 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,7 +99,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 2f149c968415915b2d2b46f3bc779dd2ac346d3a..9b283bf572790508cfe56defa89f6e244fbc0932 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 @@ -174,7 +174,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 99fe194f549e9ca8c500642c8d87fb1fde97c308..3f4aab4f08191a218ee35759c5dec32a0ada5192 160000 --- a/preprocessor +++ b/preprocessor @@ -1 +1 @@ -Subproject commit 99fe194f549e9ca8c500642c8d87fb1fde97c308 +Subproject commit 3f4aab4f08191a218ee35759c5dec32a0ada5192