--- src/tun/Makefile.orig	2014-10-21 05:59:47.000000000 +1100
+++ src/tun/Makefile	2021-12-23 14:27:12.000000000 +1100
@@ -21,17 +21,17 @@
 BUNDLE_VERSION = $(TUN_KEXT_VERSION)
 
 INCLUDE = -I.. -I/System/Library/Frameworks/Kernel.framework/Headers
-CFLAGS = -Wall -Werror -mkernel -force_cpusubtype_ALL \
+CFLAGS = -Wall -Wextra -mkernel -force_cpusubtype_ALL \
 	-nostdinc -fno-builtin -fno-stack-protector -msoft-float -fno-common \
-	-arch x86_64 \
+	@ARCHFLAGS@ \
 	-DKERNEL -DAPPLE -DKERNEL_PRIVATE -DTUNTAP_VERSION=\"$(TUNTAP_VERSION)\" \
 	-DTUN_KEXT_VERSION=\"$(TUN_KEXT_VERSION)\"
 CCFLAGS = $(CFLAGS)
-LDFLAGS = -Wall -Werror -arch x86_64 -Xlinker -kext -nostdlib -lkmodc++ -lkmod -lcc_kext
+LDFLAGS = -Wall -Wextra @ARCHFLAGS@ -Xlinker -kext -nostdlib -lkmodc++ -lkmod -lcc_kext
 
-CCP = clang -x c++
-CC = clang -x c
-LD = clang
+CCP = @CXX@
+CC = @CC@
+LD = @CC@
 
 all: $(KMOD_BIN) bundle