Skip to content

Commit

Permalink
_build.sh: keep out arm64e designator from autotools [ci skip]
Browse files Browse the repository at this point in the history
autotools doesn't recognize `arm64e`:
```
Invalid configuration `arm64e-apple-darwin': machine `arm64e-apple' not recognized
```
Ref: https://github.com/curl/curl-for-win/actions/runs/6530947363/job/17732106776#step:3:4161

So backtrack and pass this value only to `-arch` for clang-apple,
and `CMAKE_OSX_ARCHITECTURES` (we will adjust if that fails, but
so far it seems to be accepted). This also revert passing arm64e
to standard llvm which accepts this, but seems to be ignoring it
anyway (as of llvm 16/17).

Regression from 898aeab
  • Loading branch information
vszakats committed Oct 16, 2023
1 parent 6bd8aab commit 8dde5f4
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions _build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -523,12 +523,13 @@ build_single_target() {
[ "${_CPU}" = 'a64' ] && _machine='aarch64'

if [ "${_OS}" = 'mac' ] && [ "${_machine}" = 'aarch64' ] && [ "${_CC}" = 'llvm' ]; then
_machine='arm64e'
# llvm-apple supports multiple archs separated by ';', e.g. 'arm64e;x86_64'
# It also understands arm64e (vs arm64)
_machines='arm64e'
else
_machines="${_machine}"
fi

# llvm-apple supports multiple archs separated by ';', e.g. 'arm64e;x86_64'
_machines="${_machine}"

export _CURL_DLL_SUFFIX=''
export _CURL_DLL_SUFFIX_NODASH=''
if [ "${_OS}" = 'win' ]; then
Expand Down

0 comments on commit 8dde5f4

Please sign in to comment.