Skip to content

Commit 742d19e

Browse files
authored
Fix Makefile errors that prevent builds on macOS (KinesisCorporation#409)
1 parent dd3da03 commit 742d19e

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Here's all notable changes and commits to both the configuration repo and the ba
44
Many thanks to all those who have submitted issues and pull requests to make this firmware better!
55
## Config repo
66

7+
14/3/2024 - Fix Makefile errors that prevent builds on macOS [#409](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/409)
8+
79
18/2/2024 - Fix version.dtsi reset after build when running local builds [#385](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/385)
810

911
12/2/2024 - Update GitHub build workflow to use the latest actions [#376](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/376)

Makefile

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

0 commit comments

Comments
 (0)