Skip to content

Commit

Permalink
merge main, not cran
Browse files Browse the repository at this point in the history
Merge branch 'main' into lazy_profile
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
  • Loading branch information
sorhawell committed Aug 3, 2023
2 parents 17d15a5 + d91b6a5 commit d09740a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/Makevars
Original file line number Diff line number Diff line change
Expand Up @@ -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" && \
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Makevars.win
Original file line number Diff line number Diff line change
Expand Up @@ -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)" && \
Expand All @@ -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
Expand Down

0 comments on commit d09740a

Please sign in to comment.