Skip to content

Support Linux ARM #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
penberg merged 4 commits into from
Apr 24, 2025
Merged

Support Linux ARM #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f88070
add support for arm
kaaax0815 Mar 6, 2025
f36d16f
also test musl
kaaax0815 Apr 24, 2025
c0338f8
add require for promise
kaaax0815 Apr 24, 2025
2eb0678
fix undef var
kaaax0815 Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
rustflags = ["-C", "target-feature=-crt-static"]
[target.aarch64-unknown-linux-musl]
rustflags = ["-C", "target-feature=-crt-static"]
[target.arm-unknown-linux-musleabihf]
rustflags = ["-C", "target-feature=-crt-static"]
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
strategy:
fail-fast: false
matrix:
target: [x86_64-unknown-linux-gnu, x86_64-unknown-linux-musl, aarch64-unknown-linux-gnu, aarch64-unknown-linux-musl]
target: [x86_64-unknown-linux-gnu, x86_64-unknown-linux-musl, aarch64-unknown-linux-gnu, aarch64-unknown-linux-musl, arm-unknown-linux-gnueabihf, arm-unknown-linux-musleabihf]
runs-on: ubuntu-latest
permissions:
contents: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
name: Builds (other platforms)
strategy:
matrix:
target: [x86_64-unknown-linux-gnu, x86_64-unknown-linux-musl, aarch64-unknown-linux-gnu, aarch64-unknown-linux-musl]
target: [x86_64-unknown-linux-gnu, x86_64-unknown-linux-musl, aarch64-unknown-linux-gnu, aarch64-unknown-linux-musl, arm-unknown-linux-gnueabihf, arm-unknown-linux-musleabihf]
runs-on: ubuntu-latest
permissions:
contents: write
Expand Down
18 changes: 11 additions & 7 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use strict";

const { load, currentTarget } = require("@neon-rs/load");
const { familySync, GLIBC } = require("detect-libc");
const { familySync, GLIBC, MUSL } = require("detect-libc");

function requireNative() {
if (process.env.LIBSQL_JS_DEV) {
Expand All @@ -11,14 +11,18 @@ function requireNative() {
// Workaround for Bun, which reports a musl target, but really wants glibc...
if (familySync() == GLIBC) {
switch (target) {
case "linux-x64-musl":
target = "linux-x64-gnu";
break;
case "linux-arm64-musl":
target = "linux-arm64-gnu";
break;
case "linux-x64-musl":
target = "linux-x64-gnu";
break;
case "linux-arm64-musl":
target = "linux-arm64-gnu";
break;
}
}
// @neon-rs/load doesn't detect arm musl
if (target === "linux-arm-gnueabihf" && familySync() == MUSL) {
target = "linux-arm-musleabihf";
}
return require(`@libsql/${target}`);
}

Expand Down
7 changes: 5 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"cpu": [
"x64",
"arm64",
"wasm32"
"wasm32",
"arm"
],
"main": "index.js",
"types": "types/index.d.ts",
Expand Down Expand Up @@ -50,7 +51,9 @@
"x86_64-apple-darwin": "@libsql/darwin-x64",
"x86_64-pc-windows-msvc": "@libsql/win32-x64-msvc",
"x86_64-unknown-linux-gnu": "@libsql/linux-x64-gnu",
"x86_64-unknown-linux-musl": "@libsql/linux-x64-musl"
"x86_64-unknown-linux-musl": "@libsql/linux-x64-musl",
"arm-unknown-linux-gnueabihf": "@libsql/linux-arm-gnueabihf",
"arm-unknown-linux-musleabihf": "@libsql/linux-arm-musleabihf"
}
},
"repository": {
Expand Down
20 changes: 12 additions & 8 deletions promise.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use strict";

const { load, currentTarget } = require("@neon-rs/load");
const { familySync, GLIBC } = require("detect-libc");
const { familySync, GLIBC, MUSL } = require("detect-libc");

// Static requires for bundlers.
if (0) {
Expand All @@ -25,13 +25,17 @@ function requireNative() {
// Workaround for Bun, which reports a musl target, but really wants glibc...
if (familySync() == GLIBC) {
switch (target) {
case "linux-x64-musl":
target = "linux-x64-gnu";
break;
case "linux-arm64-musl":
target = "linux-arm64-gnu";
break;
}
case "linux-x64-musl":
target = "linux-x64-gnu";
break;
case "linux-arm64-musl":
target = "linux-arm64-gnu";
break;
}
}
// @neon-rs/load doesn't detect arm musl
if (target === "linux-arm-gnueabihf" && familySync() == MUSL) {
target = "linux-arm-musleabihf";
}
return require(`@libsql/${target}`);
}
Expand Down
Loading