back out r87328 for now

ripley · ripley · commit a21a62ec5937 · 2024-11-13T17:22:57.000Z
git-svn-id: https://svn.r-project.org/R/trunk@87329 00db46b3-68df-0310-9c12-caf00c1e9a41
diff --git a/doc/NEWS.Rd b/doc/NEWS.Rd
@@ -158,11 +158,6 @@
     \itemize{
       \item Control of symbol visibility is now supported on macOS (the
       previous check only worked on ELF platforms).
-
-      \item Setting environment variable \env{_R_USE_NO_REMAP_} to a
-      true valueforces \code{R_NO_REMAP} to be defined during
-      compilation of C code, except for packages with a
-      \file{src/Makefile}.
     }
   }
 
diff --git a/src/library/tools/R/install.R b/src/library/tools/R/install.R
@@ -2762,8 +2762,6 @@ 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_USE_NO_REMAP_", "TRUE")))
-         makeargs <- c(makeargs, "XDEFS=-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")))

Original file line number	Diff line number	Diff line change
`@@ -158,11 +158,6 @@`
`158`	`158`	`\itemize{`
`159`	`159`	`\item Control of symbol visibility is now supported on macOS (the`
`160`	`160`	`previous check only worked on ELF platforms).`
`161`		`-`
`162`		`- \item Setting environment variable \env{_R_USE_NO_REMAP_} to a`
`163`		`- true valueforces \code{R_NO_REMAP} to be defined during`
`164`		`- compilation of C code, except for packages with a`
`165`		`- \file{src/Makefile}.`
`166`	`161`	`}`
`167`	`162`	`}`
`168`	`163`
Original file line number	Diff line number	Diff line change
`@@ -2762,8 +2762,6 @@ if(FALSE) {`
`2762`	`2762`	`paste0("LTO_FC=", shQuote("$(LTO_FC_OPT)")))`
`2763`	`2763`	`else if(isFALSE(use_lto)) c("LTO=", "LTO_FC=")`
`2764`	`2764`	`)`
`2765`		`- if(config_val_to_logical(Sys.getenv("_R_USE_NO_REMAP_", "TRUE")))`
`2766`		`- makeargs <- c(makeargs, "XDEFS=-DR_NO_REMAP")`
`2767`	`2765`	`if(config_val_to_logical(Sys.getenv("_R_CXX_USE_NO_REMAP_", "TRUE")))`
`2768`	`2766`	`makeargs <- c(makeargs, "CXX_DEFS=-DR_NO_REMAP")`
`2769`	`2767`	`## if(config_val_to_logical(Sys.getenv("_R_USE_STRICT_R_HEADERS_", "FALSE")))`