diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7c226d82..e2ce5073 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,8 +5,8 @@ on: [push,pull_request] jobs: build: - runs-on: macos-10.15 - + runs-on: macos-latest + steps: - name: Checkout diff --git a/deps/Makefile b/deps/Makefile index 2272c30f..7987a437 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -1,7 +1,9 @@ -ARCH ?= $(shell uname -m) +override ARCH ?= $(shell uname -m) + ifeq ($(ARCH),arm64) -ARCH := aarch64 +override ARCH := aarch64 endif + TARGET := $(ARCH)-apple-macos10.12 JOBS := $(shell getconf _NPROCESSORS_ONLN) GOROOT := $${PWD}/../dist/go @@ -173,7 +175,7 @@ shadowsocks-libev: pcre libev c-ares libsodium mbedtls simple-obfs: cd simple-obfs \ && ./autogen.sh \ - && CXXFLAGS="-target $(TARGET)" CFLAGS="-target $(TARGET)" ./configure --prefix=$${PWD}/../dist/$(ARCH)/simple-obfs \ + && CFLAGS="-target $(TARGET)" ./configure --prefix=$${PWD}/../dist/$(ARCH)/simple-obfs \ --host=$(TARGET) \ --disable-dependency-tracking \ --disable-documentation \