Skip to content

Commit

Permalink
remove _R_CXX_USE_NO_REMAP_, as presaged in NEWS
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.r-project.org/R/trunk@87694 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information
ripley committed Feb 6, 2025
1 parent c24cbaa commit 615bfb8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
7 changes: 2 additions & 5 deletions doc/NEWS.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -374,11 +374,8 @@
\subsection{UTILITIES}{
\itemize{
\item \command{R CMD INSTALL} (and hence \command{check}) now by
default compile C++ code with \code{-DR_NO_REMAP}. For the time
being this can be reverted by setting environment
variable \env{_R_CXX_USE_NO_REMAP_} to a false value (but that will
be removed in the near future).
\item \command{R CMD INSTALL} (and hence \command{check}) now
compile C++ code with \code{-DR_NO_REMAP}.
\sQuote{Writing R Extensions} has been revised to describe the remapped
entry points, for with the \code{Rf_} prefix remains optional when
Expand Down
4 changes: 2 additions & 2 deletions src/library/tools/R/install.R
Original file line number Diff line number Diff line change
Expand Up @@ -2767,8 +2767,8 @@ if(FALSE) {
paste0("LTO_FC=", shQuote("$(LTO_FC_OPT)")))
else if(isFALSE(use_lto)) c("LTO=", "LTO_FC=")
)
if(config_val_to_logical(Sys.getenv("_R_CXX_USE_NO_REMAP_", "TRUE")))
makeargs <- c(makeargs, "CXX_DEFS=-DR_NO_REMAP")
## if(config_val_to_logical(Sys.getenv("_R_CXX_USE_NO_REMAP_", "TRUE")))
## makeargs <- c(makeargs, "CXX_DEFS=-DR_NO_REMAP")
## if(config_val_to_logical(Sys.getenv("_R_USE_STRICT_R_HEADERS_", "FALSE")))
## makeargs <- c(makeargs, "XDEFS=-DSTRICT_R_HEADERS=1")

Expand Down

0 comments on commit 615bfb8

Please sign in to comment.