Browse Source

Fix Makefile errors that prevent builds on macOS (#409)

V3.0
David Whetstone 2 years ago committed by GitHub
parent
commit
742d19ef63
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      CHANGELOG.md
  2. 9
      Makefile

2
CHANGELOG.md

@ -4,6 +4,8 @@ Here's all notable changes and commits to both the configuration repo and the ba
Many thanks to all those who have submitted issues and pull requests to make this firmware better! Many thanks to all those who have submitted issues and pull requests to make this firmware better!
## Config repo ## Config repo
14/3/2024 - Fix Makefile errors that prevent builds on macOS [#409](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/409)
18/2/2024 - Fix version.dtsi reset after build when running local builds [#385](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/385) 18/2/2024 - Fix version.dtsi reset after build when running local builds [#385](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/385)
12/2/2024 - Update GitHub build workflow to use the latest actions [#376](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/376) 12/2/2024 - Update GitHub build workflow to use the latest actions [#376](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/376)

9
Makefile

@ -1,8 +1,7 @@
DOCKER := "$(shell { command -v podman || command -v docker; })" DOCKER := $(shell { command -v podman || command -v docker; })
TIMESTAMP := "$(shell date -u +"%Y%m%d%H%M")" TIMESTAMP := $(shell date -u +"%Y%m%d%H%M")
COMMIT := "$(shell git rev-parse --short HEAD 2>/dev/null)" COMMIT := $(shell git rev-parse --short HEAD 2>/dev/null)
detected_OS := "$(shell uname)" # Classify UNIX OS ifeq ($(shell uname),Darwin)
ifeq ($(strip $(detected_OS)),Darwin) #We only care if it's OS X
SELINUX1 := SELINUX1 :=
SELINUX2 := SELINUX2 :=
else else

Loading…
Cancel
Save