From a5d1f7d78038c385c5ed51cb08afed39ac2712b9 Mon Sep 17 00:00:00 2001 From: Camden Narzt Date: Tue, 28 Nov 2023 18:33:55 -0700 Subject: [PATCH] make makefile more resilient to missing libgetargv --- .github/workflows/actions.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index ee5fa25..3aaf720 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: check - run: make lint + run: "make LIBVER=$(sw_vers -ProductVersion) lint" test: name: Test on ${{ matrix.os }} diff --git a/Makefile b/Makefile index 42ca997..5c465f5 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -LIBVER=$(shell vtool -show-build $(shell brew --prefix)/lib/libgetargv.dylib | awk '/minos/{print $$2}') +LIBVER ?=$(shell vtool -show-build $(shell brew --prefix)/lib/libgetargv.dylib | awk '/minos/{print $$2}') export MACOSX_DEPLOYMENT_TARGET=$(LIBVER) VERSION=0.1 COMPAT_VERSION := $(shell echo $(VERSION) | cut -f1 -d.).0