aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaytan Laats <laytanlaats@hotmail.com>2025-11-08 21:45:01 +0100
committerLaytan Laats <laytanlaats@hotmail.com>2025-11-08 21:45:01 +0100
commit171a8d1589f90a6e3d249e52ce45718049374e42 (patch)
treef409a7eb4c0faac876ce5f46931dafe58fb3a81f
parent090def7870411d54175ffc6bf23dfede71d48d45 (diff)
don't try to use amd64 lua lib on other architectures
-rw-r--r--.github/workflows/ci.yml4
-rw-r--r--vendor/lua/5.1/lua.odin4
-rw-r--r--vendor/lua/5.2/lua.odin4
-rw-r--r--vendor/lua/5.3/lua.odin4
-rw-r--r--vendor/lua/5.4/lua.odin4
5 files changed, 11 insertions, 9 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c1d46f47b..f32320042 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -103,13 +103,15 @@ jobs:
chmod +x llvm.sh
sudo ./llvm.sh 20
echo "/usr/lib/llvm-20/bin" >> $GITHUB_PATH
-
- name: Build Odin
run: ./build_odin.sh release
- name: Odin version
run: ./odin version
- name: Odin report
run: ./odin report
+ - name: Get needed vendor libs
+ if: matrix.os == 'ubuntu-24.04-arm'
+ run: sudo apt-get install -y liblua5.4-dev
- name: Compile needed Vendor
run: |
make -C vendor/stb/src
diff --git a/vendor/lua/5.1/lua.odin b/vendor/lua/5.1/lua.odin
index 19a2d9085..f955e0dd3 100644
--- a/vendor/lua/5.1/lua.odin
+++ b/vendor/lua/5.1/lua.odin
@@ -14,7 +14,7 @@ when LUA_SHARED {
when ODIN_OS == .Windows {
// Does nothing special on windows
foreign import lib "windows/lua5.1.dll.lib"
- } else when ODIN_OS == .Linux {
+ } else when ODIN_OS == .Linux && ODIN_ARCH == .amd64 {
foreign import lib "linux/liblua5.1.so"
} else {
foreign import lib "system:lua5.1"
@@ -22,7 +22,7 @@ when LUA_SHARED {
} else {
when ODIN_OS == .Windows {
foreign import lib "windows/lua5.1.dll.lib"
- } else when ODIN_OS == .Linux {
+ } else when ODIN_OS == .Linux && ODIN_ARCH == .amd64 {
foreign import lib "linux/liblua5.1.a"
} else {
foreign import lib "system:lua5.1"
diff --git a/vendor/lua/5.2/lua.odin b/vendor/lua/5.2/lua.odin
index 95105703c..98d13cf69 100644
--- a/vendor/lua/5.2/lua.odin
+++ b/vendor/lua/5.2/lua.odin
@@ -14,7 +14,7 @@ when LUA_SHARED {
when ODIN_OS == .Windows {
// Does nothing special on windows
foreign import lib "windows/lua52dll.lib"
- } else when ODIN_OS == .Linux {
+ } else when ODIN_OS == .Linux && ODIN_ARCH == .amd64 {
foreign import lib "linux/liblua52.so"
} else {
foreign import lib "system:lua5.2"
@@ -22,7 +22,7 @@ when LUA_SHARED {
} else {
when ODIN_OS == .Windows {
foreign import lib "windows/lua52dll.lib"
- } else when ODIN_OS == .Linux {
+ } else when ODIN_OS == .Linux && ODIN_ARCH == .amd64 {
foreign import lib "linux/liblua52.a"
} else {
foreign import lib "system:lua5.2"
diff --git a/vendor/lua/5.3/lua.odin b/vendor/lua/5.3/lua.odin
index 02b1c83ad..2c0dc1fbf 100644
--- a/vendor/lua/5.3/lua.odin
+++ b/vendor/lua/5.3/lua.odin
@@ -14,7 +14,7 @@ when LUA_SHARED {
when ODIN_OS == .Windows {
// Does nothing special on windows
foreign import lib "windows/lua53dll.lib"
- } else when ODIN_OS == .Linux {
+ } else when ODIN_OS == .Linux && ODIN_ARCH == .amd64 {
foreign import lib "linux/liblua53.so"
} else {
foreign import lib "system:lua5.3"
@@ -22,7 +22,7 @@ when LUA_SHARED {
} else {
when ODIN_OS == .Windows {
foreign import lib "windows/lua53dll.lib"
- } else when ODIN_OS == .Linux {
+ } else when ODIN_OS == .Linux && ODIN_ARCH == .amd64 {
foreign import lib "linux/liblua53.a"
} else {
foreign import lib "system:lua5.3"
diff --git a/vendor/lua/5.4/lua.odin b/vendor/lua/5.4/lua.odin
index 1bda09542..3ffa68714 100644
--- a/vendor/lua/5.4/lua.odin
+++ b/vendor/lua/5.4/lua.odin
@@ -14,7 +14,7 @@ when LUA_SHARED {
when ODIN_OS == .Windows {
// LUA_SHARED does nothing special on windows
foreign import lib "windows/lua54dll.lib"
- } else when ODIN_OS == .Linux {
+ } else when ODIN_OS == .Linux && ODIN_ARCH == .amd64 {
foreign import lib "linux/liblua54.so"
} else {
foreign import lib "system:lua5.4"
@@ -22,7 +22,7 @@ when LUA_SHARED {
} else {
when ODIN_OS == .Windows {
foreign import lib "windows/lua54dll.lib"
- } else when ODIN_OS == .Linux {
+ } else when ODIN_OS == .Linux && ODIN_ARCH == .amd64 {
foreign import lib "linux/liblua54.a"
} else {
foreign import lib "system:lua5.4"