Skip to content

Commit 2556866

Browse files
fix: remove makevars.ucrt template and cargo_linker in makevars.win template (#422)
* fix: remove makevars.ucrt template and cargo_linker in makevars.win template * tests: update use_extendr snapshot
1 parent ebc97bd commit 2556866

File tree

3 files changed

+0
-7
lines changed

3 files changed

+0
-7
lines changed

inst/templates/Makevars.ucrt

Lines changed: 0 additions & 5 deletions
This file was deleted.

inst/templates/Makevars.win.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ $(STATLIB):
2828

2929
# Build the project using Cargo with additional flags
3030
export CARGO_HOME=$(CARGOTMP) && \
31-
export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="$(CARGO_LINKER)" && \
3231
export LIBRARY_PATH="$(LIBRARY_PATH);$(CURDIR)/$(TARGET_DIR)/libgcc_mock" && \
3332
RUSTFLAGS="$(RUSTFLAGS) --print=native-static-libs" cargo build @CRAN_FLAGS@ --target=$(TARGET) --lib @PROFILE@ --manifest-path=rust/Cargo.toml --target-dir=$(TARGET_DIR)
3433

tests/testthat/_snaps/use_extendr.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,6 @@
287287
288288
# Build the project using Cargo with additional flags
289289
export CARGO_HOME=$(CARGOTMP) && \
290-
export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="$(CARGO_LINKER)" && \
291290
export LIBRARY_PATH="$(LIBRARY_PATH);$(CURDIR)/$(TARGET_DIR)/libgcc_mock" && \
292291
RUSTFLAGS="$(RUSTFLAGS) --print=native-static-libs" cargo build @CRAN_FLAGS@ --target=$(TARGET) --lib @PROFILE@ --manifest-path=rust/Cargo.toml --target-dir=$(TARGET_DIR)
293292

0 commit comments

Comments
 (0)