Adaptations for Darwin

cp2k · May 18, 2022 · a35688f · a35688f
1 parent e368cf3
commit a35688f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -211,9 +211,11 @@ ifneq ($(OFFLOAD_CC),)
 	@echo ""
 endif
 ifneq ($(AR),)
+ifeq (Linux,$(shell uname -s))
 	@echo "=========== AR ($(ONEVERSION)) ==========="
 	$(firstword $(AR)) V
 	@echo ""
+endif
 endif
 	@echo "========== Make ($(ONEVERSION)) =========="
 	$(MAKE) --version

diff --git a/tools/regtesting/print_environment.sh b/tools/regtesting/print_environment.sh
@@ -55,7 +55,14 @@ if [[ "${git_sha}" != "<N/A>" ]] && command -v git > /dev/null 2>&1; then
 fi
 
 echo "--------------------------- Resource limits ------------------------------"
-prlimit
+case "$(uname -s)" in
+  Linux)
+    prlimit
+    ;;
+  Darwin)
+    launchctl limit
+    ;;
+esac
 
 echo "--------------------------- SELinux --------------------------------------"
 if [[ -f /usr/sbin/getenforce ]]; then

diff --git a/tools/toolchain/scripts/stage7/install_spglib.sh b/tools/toolchain/scripts/stage7/install_spglib.sh
@@ -51,7 +51,7 @@ case "$with_spglib" in
       make -j $(get_nprocs) symspg > make.log 2>&1 || tail -n ${LOG_LINES} make.log
       make install >> install.log 2>&1 || tail -n ${LOG_LINES} install.log
       # Despite -DBUILD_SHARED_LIBS=NO the shared library gets build and installed.
-      rm "${pkg_install_dir}"/lib*/*.so*
+      rm -f "${pkg_install_dir}"/lib*/*.so*
       write_checksums "${install_lock_file}" "${SCRIPT_DIR}/stage7/$(basename ${SCRIPT_NAME})"
     fi