From 479b30fe36e4daa8dae95f2356e7f5d9e59149b9 Mon Sep 17 00:00:00 2001 From: Josiah Parry Date: Sun, 17 Nov 2024 09:12:30 -0800 Subject: [PATCH] update snapshots --- tests/testthat/_snaps/use_extendr.md | 62 ++++++++++++++-------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/tests/testthat/_snaps/use_extendr.md b/tests/testthat/_snaps/use_extendr.md index 3454f723..91d6267e 100644 --- a/tests/testthat/_snaps/use_extendr.md +++ b/tests/testthat/_snaps/use_extendr.md @@ -55,7 +55,7 @@ fi # delete Makevars if it is present - [ -f src/Makevars ] && rm src/Makevars.win + [ -f src/Makevars.win ] && rm src/Makevars.win # Substitute @CRAN_FLAGS@ in Makevars.in with the actual value of $CRAN_FLAGS sed -e "s|@CRAN_FLAGS@|$CRAN_FLAGS|" src/Makevars.win.in > src/Makevars.win @@ -294,40 +294,40 @@ CARGOTMP = $(CURDIR)/.cargo $(STATLIB): - mkdir -p $(TARGET_DIR)/libgcc_mock - # `rustc` adds `-lgcc_eh` flags to the compiler, but Rtools' GCC doesn't have - # `libgcc_eh` due to the compilation settings. So, in order to please the - # compiler, we need to add empty `libgcc_eh` to the library search paths. - # - # For more details, please refer to - # https://github.com/r-windows/rtools-packages/blob/2407b23f1e0925bbb20a4162c963600105236318/mingw-w64-gcc/PKGBUILD#L313-L316 - touch $(TARGET_DIR)/libgcc_mock/libgcc_eh.a - - # When the NOT_CRAN flag is *not* set, the vendor.tar.xz, if present, - # is unzipped and used for offline compilation. - if [ "$(NOT_CRAN)" != "true" ]; then \ - if [ -f ./rust/vendor.tar.xz ]; then \ - tar xf rust/vendor.tar.xz && \ - mkdir -p $(CARGOTMP) && \ - cp rust/vendor-config.toml $(CARGOTMP)/config.toml; \ - fi; \ - fi - - # CARGO_LINKER is provided in Makevars.ucrt for R >= 4.2 - # Build the project using Cargo with additional flags - export CARGO_HOME=$(CARGOTMP) && \ - export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="$(CARGO_LINKER)" && \ - export LIBRARY_PATH="$${LIBRARY_PATH};$(CURDIR)/$(TARGET_DIR)/libgcc_mock" && \ - RUSTFLAGS="$(RUSTFLAGS) --print=native-static-libs" cargo @CRAN_FLAGS@ build --target=$(TARGET) --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR) - - # Always clean up CARGOTMP - rm -Rf $(CARGOTMP); + mkdir -p $(TARGET_DIR)/libgcc_mock + # `rustc` adds `-lgcc_eh` flags to the compiler, but Rtools' GCC doesn't have + # `libgcc_eh` due to the compilation settings. So, in order to please the + # compiler, we need to add empty `libgcc_eh` to the library search paths. + # + # For more details, please refer to + # https://github.com/r-windows/rtools-packages/blob/2407b23f1e0925bbb20a4162c963600105236318/mingw-w64-gcc/PKGBUILD#L313-L316 + touch $(TARGET_DIR)/libgcc_mock/libgcc_eh.a + + # When the NOT_CRAN flag is *not* set, the vendor.tar.xz, if present, + # is unzipped and used for offline compilation. + if [ "$(NOT_CRAN)" != "true" ]; then \ + if [ -f ./rust/vendor.tar.xz ]; then \ + tar xf rust/vendor.tar.xz && \ + mkdir -p $(CARGOTMP) && \ + cp rust/vendor-config.toml $(CARGOTMP)/config.toml; \ + fi; \ + fi + + # CARGO_LINKER is provided in Makevars.ucrt for R >= 4.2 + # Build the project using Cargo with additional flags + export CARGO_HOME=$(CARGOTMP) && \ + export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="$(CARGO_LINKER)" && \ + export LIBRARY_PATH="$${LIBRARY_PATH};$(CURDIR)/$(TARGET_DIR)/libgcc_mock" && \ + RUSTFLAGS="$(RUSTFLAGS) --print=native-static-libs" cargo build @CRAN_FLAGS@ --target=$(TARGET) --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR) + + # Always clean up CARGOTMP + rm -Rf $(CARGOTMP); C_clean: - rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) + rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) clean: - rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR) + rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR) ---