From 35382d1a7e48594013e6fe697135dda1dcbd3dc2 Mon Sep 17 00:00:00 2001 From: ejurgensen Date: Wed, 12 Jan 2022 09:20:25 +0100 Subject: [PATCH] Attempt to fix macOS workflow mk7 --- .github/workflows/macos.yml | 4 ++-- src/Makefile.am | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 968f7ff0..80f4f8b2 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -23,8 +23,8 @@ jobs: # /usr/local because macOS already provides this software. run: | brew install gperf bison flex - echo 'export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH"' >> /Users/runner/.bash_profile - export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH" + sudo ln -s /usr/local/opt/bison/bin/bison /usr/local/bin/bison + sudo ln -s /usr/local/opt/flex/bin/flex /usr/local/bin/flex - name: Install libinotify-kqueue # brew does not have libinotify package diff --git a/src/Makefile.am b/src/Makefile.am index c96da89c..7e1727b2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -163,6 +163,8 @@ EXTRA_DIST = \ # to the particular target name, so a header file name. $(LEXER_SRC:.l=.h): $(LEXER_SRC) $(LEX) --header-file=$@ --stdout $(@:.h=.l) > /dev/null + $(YACC) --version + which $(YACC) # Anything built by make should be cleaned by make clean, but when it comes to # flex/bison automake's support leaves something to be desired