Skip to content
Snippets Groups Projects
Commit 06eb8e07 authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

Merge branch 'xcode15' into 'master'

CI: fix linker issue with XCode 15 and add job for Homebrew arm64

See merge request !90
parents 3c20b986 ed3a0eb6
No related branches found
No related tags found
1 merge request!90CI: fix linker issue with XCode 15 and add job for Homebrew arm64
Pipeline #9307 passed
...@@ -51,3 +51,15 @@ build_macos_x86_64: ...@@ -51,3 +51,15 @@ build_macos_x86_64:
artifacts: artifacts:
paths: paths:
- build/src/dynare-preprocessor - build/src/dynare-preprocessor
build_macos_arm64:
stage: build
tags:
- macOS
script:
- export PATH="/opt/homebrew/bin:$PATH"
- arch -arm64 meson setup -D buildtype=release --native-file scripts/homebrew-native-arm64.ini build
- arch -arm64 meson compile -C build -v
artifacts:
paths:
- build/src/dynare-preprocessor
# Meson native file for compiling under Homebrew / arm64
[binaries]
cpp = '/opt/homebrew/bin/g++-13'
flex = '/opt/homebrew/opt/flex/bin/flex'
bison = '/opt/homebrew/opt/bison/bin/bison'
[built-in options]
# XCode 15 (on Ventura and Sonoma) has a linker issue, see https://github.com/mesonbuild/meson/issues/12282, workaround is to use ld_classic
cpp_link_args = [ '-Wl,-ld_classic' ]
\ No newline at end of file
...@@ -4,3 +4,7 @@ ...@@ -4,3 +4,7 @@
cpp = '/usr/local/bin/g++-13' cpp = '/usr/local/bin/g++-13'
flex = '/usr/local/opt/flex/bin/flex' flex = '/usr/local/opt/flex/bin/flex'
bison = '/usr/local/opt/bison/bin/bison' bison = '/usr/local/opt/bison/bin/bison'
[built-in options]
# XCode 15 (on Ventura and Sonoma) has a linker issue, see https://github.com/mesonbuild/meson/issues/12282, workaround is to use ld_classic
cpp_link_args = [ '-Wl,-ld_classic' ]
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment