add stancflags from make/local

Author: andrjohns

R/model.R

@@ -575,12 +575,15 @@ compile <- function(quiet = TRUE,
       stanc_built_options <- c(stanc_built_options, paste0("--", option_name, "=", "'", stanc_options[[i]], "'"))
     }
   }
-  stancflags_standalone <- c("--standalone-functions", stancflags_val, stanc_built_options)
+
+  stancflags_local <- get_cmdstan_flags("STANCFLAGS")
+
+  stancflags_standalone <- c("--standalone-functions", stancflags_val, stanc_built_options, stancflags_local)
   self$functions$hpp_code <- get_standalone_hpp(temp_stan_file, stancflags_standalone)
   if (compile_standalone) {
     expose_functions(self$functions, !quiet)
   }
-  stancflags_val <- paste0("STANCFLAGS += ", stancflags_val, paste0(" ", stanc_built_options, collapse = " "))
+  stancflags_val <- paste0("STANCFLAGS += ", stancflags_val, paste0(" ", c(stanc_built_options, stancflags_local), collapse = " "))
   withr::with_path(
     c(
       toolchain_PATH_env_var(),

R/utils.R

@@ -661,19 +661,29 @@ assert_file_exists <- checkmate::makeAssertionFunction(check_file_exists)
 # Model methods & expose_functions helpers ------------------------------------------------------
 get_cmdstan_flags <- function(flag_name) {
   cmdstan_path <- cmdstanr::cmdstan_path()
-  flags <- processx::run(
-    "make",
+  flags <- wsl_compatible_run(
+    command = "make",
     args = c(paste0("print-", flag_name)),
     wd = cmdstan_path
   )$stdout
 
   flags <- gsub("\n", "", flags, fixed = TRUE)
 
   flags <- gsub(
-    pattern = paste0(flag_name, " ="),
-    replacement = "", x = flags, fixed = TRUE
+    pattern = paste0(flag_name, "\\s(=|\\+=)(\\s|$)"),
+    replacement = "", x = flags
   )
 
+  if (flags == "") {
+    return(flags)
+  }
+
+  if (flag_name == "STANCFLAGS") {
+    # StanC flags need to be returned as a character vector
+    flags_vec <- strsplit(x = flags, split = " ", fixed = TRUE)[[1]]
+    return(flags_vec)
+  }
+
   if (flag_name %in% c("LDLIBS", "LDFLAGS_TBB")) {
     # shQuote -L paths and rpaths
     # The LDLIBS flags change paths to /c/ instead of C:/, need to revert to

tests/testthat/test-model-compile.R

@@ -801,3 +801,16 @@ test_that("dirname of stan_file is used as include path if no other paths suppli
   expect_true(mod_tmp$format())
   expect_s3_class(mod_tmp$compile(), "CmdStanModel")
 })
+
+test_that("STANCFLAGS included from make/local", {
+  make_local_old <- cmdstan_make_local()
+  cmdstan_make_local(cpp_options = "STANCFLAGS += --O1", append = FALSE)
+  out <- utils::capture.output(mod$compile(quiet = FALSE, force_recompile = TRUE))
+  if(os_is_windows() && !os_is_wsl()) {
+    out_w_flags <- "bin/stanc.exe --name='bernoulli_model'  --O1 --o"
+  } else {
+    out_w_flags <- "bin/stanc --name='bernoulli_model'  --O1 --o"
+  }
+  expect_output(print(out), out_w_flags)
+  cmdstan_make_local(cpp_options = make_local_old, append = FALSE)
+})