Skip to content

Commit 122cb48

Browse files
authored
chore(r/sedonadb): Try to fix Windows build (#157)
1 parent 2df1f73 commit 122cb48

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.github/workflows/r.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
- uses: Swatinem/rust-cache@v2
8484
with:
8585
# Update this key to force a new cache
86-
prefix-key: "r-v1"
86+
prefix-key: "r-v2"
8787

8888
- uses: r-lib/actions/setup-r-dependencies@v2
8989
with:

r/sedonadb/src/Makevars.win.in

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,17 @@ $(STATLIB):
5151
# in actual, but we need this tweak to please the compiler.
5252
mkdir -p $(LIBDIR)/libgcc_mock && touch $(LIBDIR)/libgcc_mock/libgcc_eh.a
5353

54+
# AWS_LC_SYS_CFLAGS are not ideal: It would be better to use the
55+
# CMake builder but this incurs path length errors on at least one Windows builder.
56+
# The AWS_LC_SYS_CMAKE_BUILDER environment variable can still be set at a
57+
# higher level on Windows environments that support it.
58+
5459
export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="$(CARGO_LINKER)" && \
5560
export LIBRARY_PATH="$${LIBRARY_PATH};$(LIBDIR)/libgcc_mock" && \
5661
export PKG_CONFIG_SYSROOT_DIR="$(PKG_CONFIG_SYSROOT_DIR)" && \
5762
export CC="$(CC)" && \
5863
export CFLAGS="$(CFLAGS_TWEAKED)" && \
59-
export CMAKE_OBJECT_PATH_MAX=1024 && \
60-
export AWS_LC_SYS_CMAKE_BUILDER=1 && \
64+
export AWS_LC_SYS_CFLAGS="$(CFLAGS_TWEAKED) -O0" && \
6165
export RUSTFLAGS="$(RUSTFLAGS)" && \
6266
cargo build --target $(TARGET) --lib --profile $(PROFILE) $(FEATURE_FLAGS) --manifest-path ./rust/Cargo.toml --target-dir $(TARGET_DIR)
6367

0 commit comments

Comments
 (0)