correct arch for arm

duckdb · Apr 30, 2024 · 7afa2b6 · 7afa2b6
1 parent e22ed71
commit 7afa2b6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/Java.yml b/.github/workflows/Java.yml
@@ -81,7 +81,7 @@ jobs:
 
       - name: Build
         shell: bash
-        run: CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ make release
+        run: CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ OVERRIDE_JDBC_OS_ARCH=arm64 make release
 
       - name: Deploy
         shell: bash
@@ -123,7 +123,9 @@ jobs:
       - name: Java Tests
         if: ${{ inputs.skip_tests != 'true' }}
         shell: bash
-        run: make test
+        run: |
+          ls -R .
+          make test
       - name: Deploy
         shell: bash
         env:

diff --git a/Makefile b/Makefile
@@ -6,12 +6,17 @@ JARS=
 ifeq ($(OS),Windows_NT)
 	# windows is weird
 	SEP=";"
-	JARS=.
+	JARS=build/release
 else
 	SEP=":"
 	JARS=build/release
 endif
 
+ARCH_OVERRIDE=
+ifneq ($(OVERRIDE_JDBC_OS_ARCH),)
+	ARCH_OVERRIDE=-DOVERRIDE_JDBC_OS_ARCH=$(OVERRIDE_JDBC_OS_ARCH)
+endif
+
 
 GENERATOR=
 ifeq ($(GEN),ninja)
@@ -28,7 +33,7 @@ test:
 
 release:
 	mkdir -p build/release
-	cd build/release && cmake -DCMAKE_BUILD_TYPE=Release $(GENERATOR) ../.. && cmake --build . --config Release
+	cd build/release && cmake -DCMAKE_BUILD_TYPE=Release $(GENERATOR) $(ARCH_OVERRIDE) ../.. && cmake --build . --config Release
 
 clean:
 	rm -rf build