This is an automated email from the ASF dual-hosted git repository.
jiayu pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sedona-db.git
The following commit(s) were added to refs/heads/main by this push:
new 122cb48 chore(r/sedonadb): Try to fix Windows build (#157)
122cb48 is described below
commit 122cb4885aed23ccc9d2abac277dff53463c030d
Author: Dewey Dunnington <[email protected]>
AuthorDate: Fri Sep 26 11:26:46 2025 -0500
chore(r/sedonadb): Try to fix Windows build (#157)
---
.github/workflows/r.yml | 2 +-
r/sedonadb/src/Makevars.win.in | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml
index 132e60d..2a384e6 100644
--- a/.github/workflows/r.yml
+++ b/.github/workflows/r.yml
@@ -83,7 +83,7 @@ jobs:
- uses: Swatinem/rust-cache@v2
with:
# Update this key to force a new cache
- prefix-key: "r-v1"
+ prefix-key: "r-v2"
- uses: r-lib/actions/setup-r-dependencies@v2
with:
diff --git a/r/sedonadb/src/Makevars.win.in b/r/sedonadb/src/Makevars.win.in
index 4c99139..7a7414a 100644
--- a/r/sedonadb/src/Makevars.win.in
+++ b/r/sedonadb/src/Makevars.win.in
@@ -51,13 +51,17 @@ $(STATLIB):
# in actual, but we need this tweak to please the compiler.
mkdir -p $(LIBDIR)/libgcc_mock && touch
$(LIBDIR)/libgcc_mock/libgcc_eh.a
+ # AWS_LC_SYS_CFLAGS are not ideal: It would be better to use the
+ # CMake builder but this incurs path length errors on at least one
Windows builder.
+ # The AWS_LC_SYS_CMAKE_BUILDER environment variable can still be set at
a
+ # higher level on Windows environments that support it.
+
export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="$(CARGO_LINKER)" && \
export LIBRARY_PATH="$${LIBRARY_PATH};$(LIBDIR)/libgcc_mock" && \
export PKG_CONFIG_SYSROOT_DIR="$(PKG_CONFIG_SYSROOT_DIR)" && \
export CC="$(CC)" && \
export CFLAGS="$(CFLAGS_TWEAKED)" && \
- export CMAKE_OBJECT_PATH_MAX=1024 && \
- export AWS_LC_SYS_CMAKE_BUILDER=1 && \
+ export AWS_LC_SYS_CFLAGS="$(CFLAGS_TWEAKED) -O0" && \
export RUSTFLAGS="$(RUSTFLAGS)" && \
cargo build --target $(TARGET) --lib --profile $(PROFILE)
$(FEATURE_FLAGS) --manifest-path ./rust/Cargo.toml --target-dir $(TARGET_DIR)