From 102f8065b8d16b24f0a22421486c3d3afe9bbde8 Mon Sep 17 00:00:00 2001
From: Matt Swann <3lemenopy@gmail.com>
Date: Tue, 31 Aug 2021 03:10:16 +0000
Subject: [PATCH 1/2] Skip UPX on Mac ARM

---
 Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3af40909..6a3c65a8 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,12 @@ MD2ROFF_BIN=github.com/davidnewhall/md2roff@v0.0.1
 RSRC_BIN=github.com/akavel/rsrc
 
 # If upx is available, use it to compress the binaries.
-UPXPATH=$(shell which upx)
+# Skip upx in Mac ARM environments: https://github.com/upx/upx/issues/446
+ifeq ($(shell uname -ps),Darwin arm)
+	UPXPATH=
+else
+	UPXPATH=$(shell which upx)
+endif
 
 # Travis CI passes the version in. Local builds get it from the current git tag.
 ifeq ($(VERSION),)

From f01c58229a749551212d26a8b46abaf3206d0975 Mon Sep 17 00:00:00 2001
From: Matt Swann <3lemenopy@gmail.com>
Date: Fri, 12 Nov 2021 06:03:01 +0000
Subject: [PATCH 2/2] Code review feedback

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 6a3c65a8..8276288e 100644
--- a/Makefile
+++ b/Makefile
@@ -12,11 +12,11 @@ MD2ROFF_BIN=github.com/davidnewhall/md2roff@v0.0.1
 RSRC_BIN=github.com/akavel/rsrc
 
 # If upx is available, use it to compress the binaries.
+UPXPATH=$(shell which upx)
+
 # Skip upx in Mac ARM environments: https://github.com/upx/upx/issues/446
 ifeq ($(shell uname -ps),Darwin arm)
 	UPXPATH=
-else
-	UPXPATH=$(shell which upx)
 endif
 
 # Travis CI passes the version in. Local builds get it from the current git tag.