vodorod/umbrix-libcore
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 2 Wiki Activity

fix: issues

Browse Source
This commit is contained in:
Hiddify
2023-08-20 08:28:11 +00:00
parent 62b21dda0d
commit dd9de25753
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.github/workflows/release.yml vendored
View File

@@ -14,11 +14,11 @@ jobs:
fail-fast: false
matrix:
job:
- { os: "ubuntu-latest", target: "android"}
#- { os: "ubuntu-latest", target: "android"}
- { os: "ubuntu-latest", target: "linux-386", aarch: 'x86'}
- { os: "ubuntu-latest", target: "linux-amd64", aarch: 'x64'}
- { os: "ubuntu-latest", target: "windows-386", aarch: 'x86'}
- { os: "ubuntu-latest", target: "windows-amd64", aarch: 'x64' }
#- { os: "ubuntu-latest", target: "linux-amd64", aarch: 'x64'}
#- { os: "ubuntu-latest", target: "windows-386", aarch: 'x86'}
#- { os: "ubuntu-latest", target: "windows-amd64", aarch: 'x64' }
- { os: "macos-11", target: "macos-universal" }
runs-on: ${{ matrix.job.os }}
steps:
@@ -27,6 +27,18 @@ jobs:
with:
fetch-depth: 0
- name: Set up GCC
if: startsWith(matrix.job.target,'linux')
uses: egor-tensin/setup-gcc@v1
with:
version: latest
platform: ${{ matrix.job.aarch }}
- name: gcc
if: startsWith(matrix.job.target,'linux')
run: |
sudo apt-get install --reinstall libc6-dev
- name: Setup Go
uses: actions/setup-go@v4
with:

5
Makefile
View File

@@ -30,10 +30,9 @@ macos-amd64:
env GOOS=darwin GOARCH=amd64 CGO_CFLAGS="-mmacosx-version-min=10.11" CGO_LDFLAGS="-mmacosx-version-min=10.11" CGO_ENABLED=1 go build -trimpath -tags with_gvisor,with_lwip -buildmode=c-shared -o $(BINDIR)/$(NAME)-$@.dylib ./custom
macos-arm64:
env GOOS=darwin GOARCH=arm64 CGO_CFLAGS="-mmacosx-version-min=10.11" CGO_LDFLAGS="-mmacosx-version-min=10.11" CGO_ENABLED=1 go build -trimpath -tags with_gvisor,with_lwip -buildmode=c-shared -o $(BINDIR)/$(NAME)-$@.dylib ./custom
macos-combine:
lipo -create $(BINDIR)/$(NAME)-macos-amd64.dylib $(BINDIR)/$(NAME)-macos-arm64.dylib -output $(BINDIR)/$(NAME)-$@.dylib
macos-universal: macos-amd64 macos-arm64 macos-combine
macos-universal: macos-amd64 macos-arm64
lipo -create $(BINDIR)/$(NAME)-macos-amd64.dylib $(BINDIR)/$(NAME)-macos-arm64.dylib -output $(BINDIR)/$(NAME)-$@.dylib
clean: