Skip to content

Commit 615bfb8

Browse files
author
ripley
committed
remove _R_CXX_USE_NO_REMAP_, as presaged in NEWS
git-svn-id: https://svn.r-project.org/R/trunk@87694 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent c24cbaa commit 615bfb8

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

doc/NEWS.Rd

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -374,11 +374,8 @@
374374
375375
\subsection{UTILITIES}{
376376
\itemize{
377-
\item \command{R CMD INSTALL} (and hence \command{check}) now by
378-
default compile C++ code with \code{-DR_NO_REMAP}. For the time
379-
being this can be reverted by setting environment
380-
variable \env{_R_CXX_USE_NO_REMAP_} to a false value (but that will
381-
be removed in the near future).
377+
\item \command{R CMD INSTALL} (and hence \command{check}) now
378+
compile C++ code with \code{-DR_NO_REMAP}.
382379
383380
\sQuote{Writing R Extensions} has been revised to describe the remapped
384381
entry points, for with the \code{Rf_} prefix remains optional when

src/library/tools/R/install.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2767,8 +2767,8 @@ if(FALSE) {
27672767
paste0("LTO_FC=", shQuote("$(LTO_FC_OPT)")))
27682768
else if(isFALSE(use_lto)) c("LTO=", "LTO_FC=")
27692769
)
2770-
if(config_val_to_logical(Sys.getenv("_R_CXX_USE_NO_REMAP_", "TRUE")))
2771-
makeargs <- c(makeargs, "CXX_DEFS=-DR_NO_REMAP")
2770+
## if(config_val_to_logical(Sys.getenv("_R_CXX_USE_NO_REMAP_", "TRUE")))
2771+
## makeargs <- c(makeargs, "CXX_DEFS=-DR_NO_REMAP")
27722772
## if(config_val_to_logical(Sys.getenv("_R_USE_STRICT_R_HEADERS_", "FALSE")))
27732773
## makeargs <- c(makeargs, "XDEFS=-DSTRICT_R_HEADERS=1")
27742774

0 commit comments

Comments
 (0)