diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2023-03-21 16:51:18 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2023-03-22 15:02:54 +0100 |
| commit | 3ab1f94514bae96bde387435cea72472e3782b56 (patch) | |
| tree | 0f2c60e4d2b0767b87e679a00082f5738d2ad485 /tunnel/tools/libwg-go | |
| parent | 4aa4843b7431344d81e1e7c7713a20e1834b0e46 (diff) | |
tools: compile with latest NDK
The -mthumb -> -marm hack is unfortunate.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'tunnel/tools/libwg-go')
| -rw-r--r-- | tunnel/tools/libwg-go/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tunnel/tools/libwg-go/Makefile b/tunnel/tools/libwg-go/Makefile index e8cf5815..10c695e4 100644 --- a/tunnel/tools/libwg-go/Makefile +++ b/tunnel/tools/libwg-go/Makefile @@ -12,10 +12,9 @@ NDK_GO_ARCH_MAP_arm64 := arm64 NDK_GO_ARCH_MAP_mips := mipsx NDK_GO_ARCH_MAP_mips64 := mips64x -CLANG_FLAGS := --target=$(ANDROID_LLVM_TRIPLE) --gcc-toolchain=$(ANDROID_TOOLCHAIN_ROOT) --sysroot=$(ANDROID_SYSROOT) -export CGO_CFLAGS := $(CLANG_FLAGS) $(CFLAGS) +CLANG_FLAGS := --target=$(TARGET) --sysroot=$(SYSROOT) +export CGO_CFLAGS := $(CLANG_FLAGS) $(subst -mthumb,-marm,$(CFLAGS)) export CGO_LDFLAGS := $(CLANG_FLAGS) $(LDFLAGS) -Wl,-soname=libwg-go.so -export CC := $(ANDROID_C_COMPILER) export GOARCH := $(NDK_GO_ARCH_MAP_$(ANDROID_ARCH_NAME)) export GOOS := android export CGO_ENABLED := 1 |