From b2d79c23b1643e601cc5f8abbef65e4e665930a8 Mon Sep 17 00:00:00 2001 From: Tronje Krop Date: Wed, 30 Oct 2024 16:48:54 +0100 Subject: [PATCH] fix: macos compatibility (#111) Signed-off-by: Tronje Krop --- .github/workflows/build.yaml | 5 +---- config/Makefile.base | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index fea9c11..6dc32cc 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -84,10 +84,7 @@ jobs: env: BASH_COMPAT: 3.2 run: |- - brew install make; - export PATH="/opt/homebrew/opt/make/libexec/gnubin:${PATH}"; - make --version; - make --file=config/Makefile.base --trace test-self + make --file=config/Makefile.base test-self release: runs-on: ubuntu-latest diff --git a/config/Makefile.base b/config/Makefile.base index 26ec690..2d83a8b 100644 --- a/config/Makefile.base +++ b/config/Makefile.base @@ -2,10 +2,9 @@ SHELL := /bin/bash # Setup variables for special purposes. -NULL := COMMA := , -SPACE := $(NULL) $(NULL) -TAB := $(NULL) $(NULL) +SPACE := $() $() +TAB := $() $() define NEWLINE @@ -46,7 +45,6 @@ endif # System depdendent helper functions. ifeq ("$(shell uname)","Linux") - MAKESHELL := PATH=$(PATH) /bin/bash else ifeq ($(shell uname),Darwin) path-setup = $(shell \ if [ "$(1)" == "opt" ]; then \