From aab752918581e695443601e7921d96ed94b0f652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org> Date: Mon, 5 May 2025 16:47:56 +0200 Subject: [PATCH] Remove workaround for bug in Xcode, m4 is included again in version 16 This reverts commit 31080eed6ce6c623863850d4e2da5f8317f2b5d0. --- .gitlab-ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dcfde3cf..834038f4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,9 +47,6 @@ build_macos_x86_64: tags: - macOS 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 compile -C build -v artifacts: @@ -62,9 +59,6 @@ build_macos_arm64: - macOS script: - 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 compile -C build -v artifacts: -- GitLab