Keep Makeconf functions cacheable

Author: t-kalinowski

R/aaa-utils.R

@@ -734,8 +734,7 @@ quickr_makevars_has_uncached_functions <- function(config_name = "") {
 
   paths <- unique(c(
     quickr_active_makevars_all_paths(config_name),
-    quickr_makefiles_all_paths(config_name),
-    quickr_makeconf_paths(config_name)
+    quickr_makefiles_all_paths(config_name)
   ))
   paths <- paths[vapply(paths, quickr_regular_file_exists, logical(1))]
   if (!length(paths)) {
@@ -760,6 +759,8 @@ quickr_makefiles_has_uncached_functions <- function(config_name = "") {
 
 quickr_file_has_makevars_uncached_function <- function(path) {
   lines <- readLines(path, warn = FALSE)
+  lines <- quickr_join_makevars_continuations(lines)
+  lines <- vapply(lines, quickr_strip_make_comment, character(1))
   quickr_text_has_makevars_uncached_function(lines)
 }
 

tests/testthat/test-compiler-cache.R

@@ -1641,7 +1641,39 @@ test_that("quickr_cached_r_cmd_config_value keys on Makeconf env refs", {
   expect_equal(calls, 2L)
 })
 
-test_that("quickr_cached_r_cmd_config_value retries dynamic Makeconf inputs", {
+test_that("quickr_cached_r_cmd_config_value caches Makeconf make functions", {
+  cache <- new.env(parent = emptyenv())
+  makeconf <- withr::local_tempfile()
+  writeLines(
+    c(
+      "USE_LLVM =",
+      "CCBASE = $(if $(USE_LLVM),clang,gcc)",
+      "FC = $(CCBASE)"
+    ),
+    makeconf
+  )
+  calls <- 0L
+  local_mocked_bindings(
+    quickr_makeconf_path = function() makeconf,
+    quickr_r_cmd_config_probe = function(name) {
+      calls <<- calls + 1L
+      list(value = paste0("value-", calls), ok = TRUE)
+    },
+    .package = "quickr"
+  )
+
+  expect_identical(
+    quickr_cached_r_cmd_config_value("FC", cache = cache),
+    "value-1"
+  )
+  expect_identical(
+    quickr_cached_r_cmd_config_value("FC", cache = cache),
+    "value-1"
+  )
+  expect_equal(calls, 1L)
+})
+
+test_that("quickr_cached_r_cmd_config_value keys on dynamic Makeconf content", {
   cache <- new.env(parent = emptyenv())
   root <- withr::local_tempdir()
   makeconf <- file.path(root, "Makeconf")
@@ -1664,6 +1696,15 @@ test_that("quickr_cached_r_cmd_config_value retries dynamic Makeconf inputs", {
   )
 
   writeLines("flang", compiler_file)
+  expect_identical(
+    quickr_cached_r_cmd_config_value("FC", cache = cache),
+    "value-1"
+  )
+
+  writeLines(
+    paste("FC = $(shell cat", compiler_file, ") # changed"),
+    makeconf
+  )
   expect_identical(
     quickr_cached_r_cmd_config_value("FC", cache = cache),
     "value-2"