review

ethanndickson · ethanndickson · commit 1bd6529691d3 · 2024-11-15T07:04:12.000Z
diff --git a/Makefile b/Makefile
@@ -80,11 +80,11 @@ PACKAGE_OS_ARCHES := linux_amd64 linux_armv7 linux_arm64
 DOCKER_ARCHES := amd64 arm64 armv7
 
 # All ${OS}_${ARCH} combos we build the desktop dylib for.
-DYLIB_ARCHES := darwin_amd64.dylib darwin_arm64.dylib
+DYLIB_ARCHES := darwin_amd64 darwin_arm64
 
 # Computed variables based on the above.
 CODER_SLIM_BINARIES      := $(addprefix build/coder-slim_$(VERSION)_,$(OS_ARCHES))
-CODER_DYLIBS             := $(addprefix build/coder-vpn_$(VERSION)_,$(DYLIB_ARCHES))
+CODER_DYLIBS             := $(foreach os_arch, $(DYLIB_ARCHES), build/coder-vpn_$(VERSION)_$(os_arch).dylib)
 CODER_FAT_BINARIES       := $(addprefix build/coder_$(VERSION)_,$(OS_ARCHES))
 CODER_ALL_BINARIES       := $(CODER_SLIM_BINARIES) $(CODER_FAT_BINARIES)
 CODER_TAR_GZ_ARCHIVES    := $(foreach os_arch, $(ARCHIVE_TAR_GZ), build/coder_$(VERSION)_$(os_arch).tar.gz)
@@ -254,7 +254,7 @@ $(CODER_DYLIBS): go.mod go.sum $(GO_SRC_FILES)
 			--dylib
 
 		cp "$@" "./site/out/bin/coder-vpn-$$os-$$arch.dylib"
-		cp "*.h" "./site/out/bin/coder-vpn-$$os.h"
+		cp ./build/*.h "./site/out/bin/coder-vpn-$$os.h"
 	else
 		echo "Skipping dylib build on non-Darwin OS"
 	fi
diff --git a/scripts/build_go.sh b/scripts/build_go.sh
@@ -177,15 +177,15 @@ if [[ "$agpl" == 1 ]]; then
 fi
 
 cgo=0
-sdk=""
 if [[ "$dylib" == 1 ]]; then
 	if [[ "$os" != "darwin" ]]; then
 		error "dylib builds are not supported on $os"
 	fi
 	cgo=1
 	cmd_path="./vpn/dylib/lib.go"
 	build_args+=("-buildmode=c-shared")
-	sdk="$(xcrun --sdk macosx --show-sdk-path)"
+	SDKROOT="$(xcrun --sdk macosx --show-sdk-path)"
+	export SDKROOT
 	bin_ident="com.coder.vpn"
 fi
 
@@ -195,7 +195,7 @@ if [[ "$boringcrypto" == 1 ]]; then
 	goexp="boringcrypto"
 fi
 
-GOEXPERIMENT="$goexp" CGO_ENABLED="$cgo" GOOS="$os" GOARCH="$arch" GOARM="$arm_version" SDKROOT="$sdk" \
+GOEXPERIMENT="$goexp" CGO_ENABLED="$cgo" GOOS="$os" GOARCH="$arch" GOARM="$arm_version" \
 	go build \
 	"${build_args[@]}" \
 	"$cmd_path" 1>&2
diff --git a/scripts/sign_darwin.sh b/scripts/sign_darwin.sh
@@ -8,6 +8,9 @@
 # On success, the input file will be signed using the Apple Developer
 # certificate.
 #
+# For the Coder CLI, the binary_identifier should be "com.coder.cli".
+# For the CoderVPN `.dylib`, the binary_identifier should be "com.coder.vpn".
+#
 # You can check if a binary is signed by running the following command on a Mac:
 #   codesign -dvv path/to/binary
 #

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,9 @@`
`8`	`8`	`# On success, the input file will be signed using the Apple Developer`
`9`	`9`	`# certificate.`
`10`	`10`	`#`
	`11`	`+# For the Coder CLI, the binary_identifier should be "com.coder.cli".`
	`12`	+# For the CoderVPN `.dylib`, the binary_identifier should be "com.coder.vpn".
	`13`	`+#`
`11`	`14`	`# You can check if a binary is signed by running the following command on a Mac:`
`12`	`15`	`# codesign -dvv path/to/binary`
`13`	`16`	`#`