From d91b6a5a46498191f051d61e46ad283133c345f7 Mon Sep 17 00:00:00 2001 From: eitsupi <50911393+eitsupi@users.noreply.github.com> Date: Tue, 1 Aug 2023 19:37:05 +0900 Subject: [PATCH] build: always NOT_CRAN=true (#340) --- src/Makevars | 4 ++-- src/Makevars.win | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Makevars b/src/Makevars index 2ed1aaa49..facd51f82 100644 --- a/src/Makevars +++ b/src/Makevars @@ -15,7 +15,7 @@ $(SHLIB): $(STATLIB) CARGOTMP = $(CURDIR)/.cargo $(STATLIB): - if [ "$(NOT_CRAN)" != "true" ]; then \ + if [ "true" != "true" ]; then \ export CARGO_HOME=$(CARGOTMP); \ fi && \ export PATH="$(PATH):$(HOME)/.cargo/bin" && \ @@ -24,7 +24,7 @@ $(STATLIB): else \ $(BUILD_COMMAND); \ fi - if [ "$(NOT_CRAN)" != "true" ]; then \ + if [ "true" != "true" ]; then \ rm -Rf $(CARGOTMP) && \ rm -Rf $(LIBDIR)/build; \ fi diff --git a/src/Makevars.win b/src/Makevars.win index afa631762..c62ca685f 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -21,7 +21,7 @@ $(STATLIB): mkdir -p $(TARGET_DIR)/libgcc_mock && touch $(TARGET_DIR)/libgcc_mock/libgcc_eh.a # CARGO_LINKER is provided in Makevars.ucrt for R >= 4.2 - if [ "$(NOT_CRAN)" != "true" ]; then \ + if [ "true" != "true" ]; then \ export CARGO_HOME=$(CARGOTMP); \ fi && \ export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="$(CARGO_LINKER)" && \ @@ -31,7 +31,7 @@ $(STATLIB): else \ $(BUILD_COMMAND); \ fi; - if [ "$(NOT_CRAN)" != "true" ]; then \ + if [ "true" != "true" ]; then \ rm -Rf $(CARGOTMP) && \ rm -Rf $(LIBDIR)/build; \ fi