Skip to content

Fix build on Windows ARM64 #24

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
JosiahParry merged 1 commit into from
Aug 3, 2026
Merged

Fix build on Windows ARM64 #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions .github/workflows/R-CMD-check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
config:
- {os: macos-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: windows-11-arm, r: 'release'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
- {os: ubuntu-latest, r: 'oldrel-1'}
Expand All @@ -31,6 +32,9 @@ jobs:
steps:
- uses: actions/checkout@v3

- if: ${{ runner.os == 'windows' && runner.arch == 'ARM64' }}
run: rustup target add aarch64-pc-windows-gnullvm

- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v2
Expand Down
2 changes: 1 addition & 1 deletion src/Makevars.win.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TARGET = $(subst 64,x86_64,$(subst 32,i686,$(WIN)))-pc-windows-gnu
TARGET = @WINDOWS_TARGET@

TARGET_DIR = ./rust/target
LIBDIR = $(TARGET_DIR)/$(TARGET)/@LIBDIR@
Expand Down
12 changes: 6 additions & 6 deletions src/rust/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2018"
crate-type = ["staticlib"]

[dependencies]
extendr-api = "0.8.1"
extendr-api = "0.8.2"
geo-types = "0.7.9"
h3o = { version = "0.6.4", features = ["geo"] }
rayon = "1.7.0"
Expand Down
Binary file modified src/rust/vendor.tar.xz
View file
Open in desktop
Binary file not shown.
11 changes: 11 additions & 0 deletions tools/config.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,19 @@ if (file.exists(mv_ofp)) {
# read as a single string
mv_txt <- readLines(mv_fp)

.windows_target <- if (grepl("aarch", R.version$platform)) {
"aarch64-pc-windows-gnullvm"
} else if (grepl("clang", Sys.getenv("R_COMPILED_BY"))) {
"x86_64-pc-windows-gnullvm"
} else if (grepl("i386", R.version$platform)) {
"i686-pc-windows-gnu"
} else {
"x86_64-pc-windows-gnu"
}

# replace placeholder values
new_txt <- gsub("@CRAN_FLAGS@", .cran_flags, mv_txt) |>
gsub("@WINDOWS_TARGET@", .windows_target, x = _) |>
gsub("@PROFILE@", .profile, x = _) |>
gsub("@CLEAN_TARGET@", .clean_targets, x = _) |>
gsub("@LIBDIR@", .libdir, x = _) |>
Expand Down
Loading