From f70a9554a89265cf31096385e8ed3c8e95c28e38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Mon, 2 Oct 2023 17:00:22 +0200
Subject: [PATCH] CI: rename Meson Homebrew/x86-64 cross file, for clarity
Also enforce the path to x86-64 GCC.
---
.gitlab-ci.yml | 2 +-
scripts/{homebrew-native.ini => homebrew-native-x86_64.ini} | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
rename scripts/{homebrew-native.ini => homebrew-native-x86_64.ini} (50%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cca6914e..4444c1db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,7 +46,7 @@ build_macos_x86_64:
tags:
- macOS
script:
- - arch -x86_64 meson setup -D buildtype=release --native-file scripts/homebrew-native.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
artifacts:
paths:
diff --git a/scripts/homebrew-native.ini b/scripts/homebrew-native-x86_64.ini
similarity index 50%
rename from scripts/homebrew-native.ini
rename to scripts/homebrew-native-x86_64.ini
index 919b2104..d256a0dc 100644
--- a/scripts/homebrew-native.ini
+++ b/scripts/homebrew-native-x86_64.ini
@@ -1,6 +1,6 @@
-# Meson native file for compiling under Homebrew
+# Meson native file for compiling under Homebrew / x86-64
[binaries]
-cpp = 'g++-13'
+cpp = '/usr/local/bin/g++-13'
flex = '/usr/local/opt/flex/bin/flex'
bison = '/usr/local/opt/bison/bin/bison'
--
GitLab