ci: add ARCH variable to makefile, override it during cross-compilation

archtechx · Jan 2, 2025 · bc12957 · bc12957
1 parent 611195e
commit bc12957
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/extensions.yml b/.github/workflows/extensions.yml
@@ -75,7 +75,7 @@ jobs:
           export CC=/opt/homebrew/opt/llvm/bin/clang
           export CFLAGS="-target x86_64-apple-darwin"
           export LDFLAGS="-target x86_64-apple-darwin"
-          make
+          make ARCH=x86_64
 
     - name: Commit output files
       shell: bash

diff --git a/extensions/Makefile b/extensions/Makefile
@@ -9,14 +9,15 @@ ifeq ($(OS),Windows_NT)
 else
 	UNAME := $(shell uname)
 	CCFLAGS += -fPIC -Os -shared
+	ARCH := $(if $(ARCH),$(ARCH),$(shell uname -m))
 	ifeq ($(UNAME),Darwin)
-		ifeq ($(shell uname -m),arm64)
+		ifeq ($(ARCH),arm64)
 			OUTPUT = lib/arm/noattach.dylib
 		else
 			OUTPUT = lib/noattach.dylib
 		endif
 	else
-		ifeq ($(shell uname -m),aarch64)
+		ifeq ($(ARCH),aarch64)
 			OUTPUT = lib/arm/noattach.so
 		else
 			OUTPUT = lib/noattach.so