From 1ac19ae0d0b552d8515b799fd3ad265a5afc477b Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 27 Jul 2022 03:32:18 +0300 Subject: [PATCH 44/44] CI: Unhardcode homebrew component paths See osdn #45247 Signed-off-by: Marko Lindqvist --- scripts/ci-build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index 41c672cebe..3408c48adc 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -52,10 +52,10 @@ ninja install "os_x") # gcc is an alias for clang on OS X -export PATH="/usr/local/opt/llvm/bin:/usr/local/opt/gettext/bin:/usr/local/opt/icu4c/bin:$(brew --prefix qt@6)/bin:$PATH" -export CPPFLAGS="-I/usr/local/opt/gettext/include -I/usr/local/opt/icu4c/include -I$(brew --prefix qt@6)/include -I$(brew --prefix readline)/include" -export LDFLAGS="-L/usr/local/opt/gettext/lib -L/usr/local/opt/icu4c/lib -L$(brew --prefix qt@6)/lib -L$(brew --prefix readline)/lib" -export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:$PKG_CONFIG_PATH" +export PATH="$(brew --prefix llvm)/bin:$(brew --prefix gettext)/bin:$(brew --prefix icu4c)/bin:$(brew --prefix qt@6)/bin:$PATH" +export CPPFLAGS="-I$(brew --prefix gettext)/include -I$(brew --prefix icu4c)/include -I$(brew --prefix qt@6)/include -I$(brew --prefix readline)/include" +export LDFLAGS="-L$(brew --prefix gettext)/lib -L$(brew --prefix icu4c)/lib -L$(brew --prefix qt@6)/lib -L$(brew --prefix readline)/lib" +export PKG_CONFIG_PATH="$(brew --prefix icu4c)/lib/pkgconfig" export MOCCMD=$(find /usr/local/Cellar/qt -name "moc" | head -n 1) -- 2.35.1