diff --git a/tools/gha_osx_arm64_static.sh b/tools/gha_osx_arm64_static.sh index 57250fa7d..49e9e6649 100644 --- a/tools/gha_osx_arm64_static.sh +++ b/tools/gha_osx_arm64_static.sh @@ -11,7 +11,7 @@ wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge export deps_dir=$HOME/local export PATH="$HOME/miniconda/bin:$PATH" bash miniconda.sh -b -p $HOME/miniconda -conda create -y -p $deps_dir 'c-compiler<1.8' zlib 'cxx-compiler<1.8' libcxx cmake ninja \ +conda create -y -p $deps_dir c-compiler zlib cxx-compiler libcxx cmake ninja \ llvmdev tbb-devel tbb libboost-devel sleef xtensor xtensor-blas blas \ blas-devel fmt spdlog 'mppp=1.*' source activate $deps_dir diff --git a/tools/gha_osx_x86.sh b/tools/gha_osx_x86.sh index 40e2db1c0..9029937e3 100644 --- a/tools/gha_osx_x86.sh +++ b/tools/gha_osx_x86.sh @@ -11,7 +11,7 @@ wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge export deps_dir=$HOME/local export PATH="$HOME/miniconda/bin:$PATH" bash miniconda.sh -b -p $HOME/miniconda -conda create -y -p $deps_dir 'c-compiler<1.8' zlib 'cxx-compiler<1.8' libcxx cmake ninja \ +conda create -y -p $deps_dir c-compiler zlib cxx-compiler libcxx cmake ninja \ llvmdev tbb-devel tbb libboost-devel sleef xtensor xtensor-blas blas \ blas-devel fmt spdlog 'mppp=1.*' source activate $deps_dir @@ -25,7 +25,7 @@ unset CXXFLAGS unset CFLAGS # Configure. -CXX=clang++ CC=clang cmake ../ -G Ninja \ +CXX=clang++ CC=clang cmake -G Ninja ../ \ -DCMAKE_PREFIX_PATH=$deps_dir \ -DCMAKE_BUILD_TYPE=Debug \ -DHEYOKA_BUILD_TESTS=yes \ diff --git a/tools/gha_osx_x86_static.sh b/tools/gha_osx_x86_static.sh index c7e8e6333..497b3bad9 100644 --- a/tools/gha_osx_x86_static.sh +++ b/tools/gha_osx_x86_static.sh @@ -11,7 +11,7 @@ wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge export deps_dir=$HOME/local export PATH="$HOME/miniconda/bin:$PATH" bash miniconda.sh -b -p $HOME/miniconda -conda create -y -p $deps_dir 'c-compiler<1.8' zlib 'cxx-compiler<1.8' libcxx cmake ninja \ +conda create -y -p $deps_dir c-compiler zlib cxx-compiler libcxx cmake ninja \ llvmdev tbb-devel tbb libboost-devel sleef xtensor xtensor-blas blas \ blas-devel fmt spdlog 'mppp=1.*' source activate $deps_dir