Merge pull request #373 from swannman/master
Skip upx when building on Mac ARM
This commit is contained in:
commit
f524ae066b
5
Makefile
5
Makefile
|
|
@ -14,6 +14,11 @@ RSRC_BIN=github.com/akavel/rsrc
|
||||||
# If upx is available, use it to compress the binaries.
|
# If upx is available, use it to compress the binaries.
|
||||||
UPXPATH=$(shell which upx)
|
UPXPATH=$(shell which upx)
|
||||||
|
|
||||||
|
# Skip upx in Mac ARM environments: https://github.com/upx/upx/issues/446
|
||||||
|
ifeq ($(shell uname -ps),Darwin arm)
|
||||||
|
UPXPATH=
|
||||||
|
endif
|
||||||
|
|
||||||
# Travis CI passes the version in. Local builds get it from the current git tag.
|
# Travis CI passes the version in. Local builds get it from the current git tag.
|
||||||
ifeq ($(VERSION),)
|
ifeq ($(VERSION),)
|
||||||
include .metadata.make
|
include .metadata.make
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue