Skip to content

Commit

Permalink
try fixing macos gcc builds 10
Browse files Browse the repository at this point in the history
  • Loading branch information
vszakats committed Jul 12, 2024
1 parent 11a9e82 commit 59b835e
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions _build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -736,11 +736,7 @@ build_single_target() {
fi
fi
elif [ "${_OS}" = 'mac' ]; then
if [ "${_CC}" = 'gcc' ] && [ "${_machine}" = 'aarch64' ]; then
_TRIPLET="arm64-apple-darwin"
else
_TRIPLET="${_machine}-apple-darwin"
fi
_TRIPLET="${_machine}-apple-darwin"

_RUN_BIN='echo'
if [ "${_HOST}" = 'mac' ]; then
Expand Down Expand Up @@ -1252,8 +1248,10 @@ build_single_target() {
fi
fi

_CMAKE_GLOBAL+=" -DCMAKE_C_COMPILER_TARGET=${_TRIPLET}"
_CMAKE_CXX_GLOBAL+=" -DCMAKE_CXX_COMPILER_TARGET=${_TRIPLET}"
if [ "${_OS}" != 'mac' ] || [ "${_CC}" != 'gcc' ]; then # skip for mac-gcc
_CMAKE_GLOBAL+=" -DCMAKE_C_COMPILER_TARGET=${_TRIPLET}"
_CMAKE_CXX_GLOBAL+=" -DCMAKE_CXX_COMPILER_TARGET=${_TRIPLET}"
fi

# Needed to exclude compiler info from objects, but for our Windows COFF
# outputs this seems to be a no-op as of llvm/clang 13.x/14.x.
Expand Down

0 comments on commit 59b835e

Please sign in to comment.