Skip to content

Commit

Permalink
Fix system makeconf on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
lionel- committed Jun 25, 2024
1 parent e9f5b0f commit b4f4557
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion R/compilation-db.R
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,14 @@ build_commands <- function(src_path, package, files, desc) {
# `R CMD config` is quite slow so we print the variables of interest by directly
# invoking make
compilers <- function() {
if (is_windows()) {
system_makeconf <- fs::path(R.home(), "etc", .Platform$r_arch, "Makeconf")

Check warning on line 168 in R/compilation-db.R

View check run for this annotation

Codecov / codecov/patch

R/compilation-db.R#L167-L168

Added lines #L167 - L168 were not covered by tests
} else {
system_makeconf <- fs::path(R.home(), "etc", "Makeconf")

Check warning on line 170 in R/compilation-db.R

View check run for this annotation

Codecov / codecov/patch

R/compilation-db.R#L170

Added line #L170 was not covered by tests
}

makevars <- c(
fs::path(R.home(), "etc", "Makeconf"),
system_makeconf,
tools::makevars_site(),
tools::makevars_user(),
system.file("print-var.mk", package = "pkgload")
Expand Down

0 comments on commit b4f4557

Please sign in to comment.