From a9d00d8550cd45a229c544103d53424a1afa7c85 Mon Sep 17 00:00:00 2001 From: Josiah Parry Date: Sun, 27 Oct 2024 16:13:52 -0700 Subject: [PATCH] update snaps --- tests/testthat/_snaps/use_cran_defaults.md | 12 +++++++++--- tests/testthat/_snaps/use_extendr.md | 11 ++++++++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/tests/testthat/_snaps/use_cran_defaults.md b/tests/testthat/_snaps/use_cran_defaults.md index aa89ea55..e2e97869 100644 --- a/tests/testthat/_snaps/use_cran_defaults.md +++ b/tests/testthat/_snaps/use_cran_defaults.md @@ -12,7 +12,7 @@ v Writing 'src/Makevars.win' v Writing 'src/Makevars.ucrt' v Writing 'src/.gitignore' - v Adding "^src/\\.cargo$" to '.Rbuildignore'. + v Adding '^src/\\.cargo$' to '.Rbuildignore' v Writing 'src/rust/Cargo.toml' v Writing 'src/rust/src/lib.rs' v Writing 'src/testpkg-win.def' @@ -30,8 +30,8 @@ v Writing 'configure.win' > File 'src/Makevars' already exists. Skip writing the file. > File 'src/Makevars.win' already exists. Skip writing the file. - v Adding "^src/rust/vendor$" to '.Rbuildignore'. - v Adding "src/rust/vendor" to '.gitignore'. + v Adding '^src/rust/vendor$' to '.Rbuildignore' + v Adding 'src/rust/vendor' to '.gitignore' --- @@ -43,6 +43,9 @@ STATLIB = $(LIBDIR)/libtestpkg.a PKG_LIBS = -L$(LIBDIR) -ltestpkg + # Print linked static libraries at compile time + export RUSTFLAGS=--print=native-static-libs + all: C_clean $(SHLIB): $(STATLIB) @@ -81,6 +84,9 @@ STATLIB = $(LIBDIR)/libtestpkg.a PKG_LIBS = -L$(LIBDIR) -ltestpkg -lws2_32 -ladvapi32 -luserenv -lbcrypt -lntdll + # Print linked static libraries at compile time + export RUSTFLAGS=--print=native-static-libs + all: C_clean $(SHLIB): $(STATLIB) diff --git a/tests/testthat/_snaps/use_extendr.md b/tests/testthat/_snaps/use_extendr.md index 7cf6ce67..748f4962 100644 --- a/tests/testthat/_snaps/use_extendr.md +++ b/tests/testthat/_snaps/use_extendr.md @@ -12,7 +12,7 @@ v Writing 'src/Makevars.win' v Writing 'src/Makevars.ucrt' v Writing 'src/.gitignore' - v Adding "^src/\\.cargo$" to '.Rbuildignore'. + v Adding '^src/\\.cargo$' to '.Rbuildignore' v Writing 'src/rust/Cargo.toml' v Writing 'src/rust/src/lib.rs' v Writing 'src/testpkg-win.def' @@ -48,6 +48,9 @@ STATLIB = $(LIBDIR)/libtestpkg.a PKG_LIBS = -L$(LIBDIR) -ltestpkg + # Print linked static libraries at compile time + export RUSTFLAGS=--print=native-static-libs + all: C_clean $(SHLIB): $(STATLIB) @@ -86,6 +89,9 @@ STATLIB = $(LIBDIR)/libtestpkg.a PKG_LIBS = -L$(LIBDIR) -ltestpkg -lws2_32 -ladvapi32 -luserenv -lbcrypt -lntdll + # Print linked static libraries at compile time + export RUSTFLAGS=--print=native-static-libs + all: C_clean $(SHLIB): $(STATLIB) @@ -260,6 +266,9 @@ STATLIB = $(LIBDIR)/libbar.a PKG_LIBS = -L$(LIBDIR) -lbar + # Print linked static libraries at compile time + export RUSTFLAGS=--print=native-static-libs + all: C_clean $(SHLIB): $(STATLIB)