Skip to content

Commit e5f2d1e

Browse files
committed
update configure
1 parent 16a006f commit e5f2d1e

File tree

1 file changed

+4
-35
lines changed

1 file changed

+4
-35
lines changed

tools/config.R

Lines changed: 4 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -157,18 +157,11 @@ configure_common <- function(type) {
157157

158158
configure_platform <- function(type) {
159159

160-
sysname <- Sys.info()[["sysname"]]
161-
switch(
162-
sysname,
163-
"Windows" = configure_platform_windows(type),
164-
"Darwin" = configure_platform_darwin(type),
165-
"Linux" = configure_platform_linux(type),
166-
"SunOS" = configure_platform_solaris(type),
167-
stop("unrecognized platform '", sysname, "'")
168-
)
169-
}
160+
sysname <- tolower(Sys.info()[["sysname"]])
170161

171-
configure_platform_common <- function(subdirs, type) {
162+
subdirs <- sysname
163+
if (sysname != "windows")
164+
subdirs <- c("unix", subdirs)
172165

173166
dirs <- c("R", "src")
174167
for (dir in dirs) {
@@ -189,26 +182,6 @@ configure_platform_common <- function(subdirs, type) {
189182
}
190183
}
191184

192-
configure_platform_windows <- function(type) {
193-
subdirs <- c("windows", bitness("windows/win"))
194-
configure_platform_common(subdirs, type)
195-
}
196-
197-
configure_platform_darwin <- function(type) {
198-
subdirs <- c("unix", "darwin", bitness("darwin/darwin"))
199-
configure_platform_common(subdirs, type)
200-
}
201-
202-
configure_platform_linux <- function(type) {
203-
subdirs <- c("unix", "linux", bitness("linux/linux"))
204-
configure_platform_common(subdirs, type)
205-
}
206-
207-
configure_platform_solaris <- function(type) {
208-
subdirs <- c("unix", "sunos", bitness("sunos/sunos"))
209-
configure_platform_common(subdirs, type)
210-
}
211-
212185
#' Execute R CMD config
213186
#'
214187
#' Read information about how \R is configured as through `R CMD config`.
@@ -558,10 +531,6 @@ parse_key_value <- function(
558531
named(as.list(vals), keys)
559532
}
560533

561-
bitness <- function(prefix = "") {
562-
paste(prefix, .Machine$sizeof.pointer * 8, sep = "")
563-
}
564-
565534
move_directory <- function(source, target) {
566535

567536
# ensure we're trying to move a directory

0 commit comments

Comments
 (0)