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

Remove workaround for bug in Xcode, m4 is included again in version 16

This reverts commit 31080eed.

(cherry picked from commit aab75291)
parent 06c8bd92
No related branches found
No related tags found
No related merge requests found
...@@ -48,9 +48,6 @@ build_macos_x86_64: ...@@ -48,9 +48,6 @@ build_macos_x86_64:
tags: tags:
- macOS - macOS
script: script:
# Workaround for bug in Xcode 15.3 which does not include m4
# See https://github.com/Homebrew/homebrew-core/issues/165388 and https://trac.macports.org/ticket/69639
- export PATH="/usr/local/opt/m4/bin/:$PATH"
- arch -x86_64 meson setup -D buildtype=release --native-file scripts/homebrew-native-x86_64.ini build - arch -x86_64 meson setup -D buildtype=release --native-file scripts/homebrew-native-x86_64.ini build
- arch -x86_64 meson compile -C build -v - arch -x86_64 meson compile -C build -v
artifacts: artifacts:
...@@ -63,9 +60,6 @@ build_macos_arm64: ...@@ -63,9 +60,6 @@ build_macos_arm64:
- macOS - macOS
script: script:
- export PATH="/opt/homebrew/bin:$PATH" - export PATH="/opt/homebrew/bin:$PATH"
# Workaround for bug in Xcode 15.3 which does not include m4
# See https://github.com/Homebrew/homebrew-core/issues/165388 and https://trac.macports.org/ticket/69639
- export PATH="/opt/homebrew/opt/m4/bin/:$PATH"
- arch -arm64 meson setup -D buildtype=release --native-file scripts/homebrew-native-arm64.ini build - arch -arm64 meson setup -D buildtype=release --native-file scripts/homebrew-native-arm64.ini build
- arch -arm64 meson compile -C build -v - arch -arm64 meson compile -C build -v
artifacts: artifacts:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment