Skip to content

Commit 1a12e42

Browse files
committed
fixes for mac os
1 parent 8531cf1 commit 1a12e42

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

cmake/utils.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function(detect_os)
2525
OUTPUT_VARIABLE MACOS_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
2626
execute_process(COMMAND sw_vers -productVersion
2727
COMMAND cut -d . -f 1
28-
COMMAND awk '{print $1 ".0"}'
28+
COMMAND awk \'{print $1 ".0"}\'
2929
OUTPUT_VARIABLE MACOS_VERSION_GENERAL OUTPUT_STRIP_TRAILING_WHITESPACE)
3030
execute_process(COMMAND arch
3131
OUTPUT_VARIABLE MACOS_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)

util/installation/common/util.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,8 @@ function CleanBuild {
264264
GCC_VER=${result[2]}
265265
GCC_VER=$( echo $GCC_VER | cut -d '.' -f 1-2)
266266
fi
267-
268-
if [ "${CLEAN_BUILD_OS}"!="osx" ] || [ -z "${GCC_VER}" ] || [ `echo "$GCC_VER >= 12" | bc -q` -ne 0 ] || [ `echo "$GCC_VER < 9" | bc -q` -ne 0 ]; then
267+
if [ "$CLEAN_BUILD_OS"!="osx" ]; then
268+
if [ -z "${GCC_VER}" ] || [ `echo "$GCC_VER >= 12" | bc -q` -ne 0 ] || [ `echo "$GCC_VER < 9" | bc -q` -ne 0 ]; then
269269

270270

271271
if $(command -v gcc-11 > /dev/null) && $(command -v g++-11 > /dev/null) && $(command -v gfortran-11 > /dev/null); then
@@ -346,8 +346,9 @@ Using that."
346346

347347

348348

349+
fi
349350
fi
350-
351+
351352
echo "CMAKEFLAGS $BDM_CMAKE_FLAGS"
352353
cmake $BDM_CMAKE_FLAGS ..
353354
make -j$(CPUCount) && make install

0 commit comments

Comments
 (0)