unset + env

Author: rok

r/inst/build_arrow_static.sh

@@ -114,7 +114,8 @@ ${CMAKE_WRAPPER} ${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
     -G "${CMAKE_GENERATOR:-Unix Makefiles}" \
     ${SOURCE_DIR}
 
-${CMAKE} --build . --target install -- -j"${N_JOBS}"
+env | sort
+(unset MAKEFLAGS MFLAGS GNUMAKEFLAGS; ${CMAKE} --build . --target install -- -j"${N_JOBS}")
 
 if command -v sccache &> /dev/null; then
   echo "=== sccache stats after the build ==="

r/tools/nixlibs.R

@@ -516,14 +516,6 @@ env_vars_as_string <- function(env_var_list) {
   env_var_string
 }
 
-strip_make_job_flags <- function(makeflags) {
-  makeflags <- gsub("(^|\\s)--jobserver-[^[:space:]]+", " ", makeflags, perl = TRUE)
-  makeflags <- gsub("(^|\\s)--jobs(=|\\s+)?[0-9]*(?=\\s|$)", " ", makeflags, perl = TRUE)
-  makeflags <- gsub("(^|\\s)-j\\s*[0-9]*(?=\\s|$)", " ", makeflags, perl = TRUE)
-  makeflags <- gsub("(^|\\s)([[:alpha:]]*)j[0-9]*([[:alpha:]]*)(?=\\s|$)", "\\1\\2\\3", makeflags, perl = TRUE)
-  trimws(gsub("\\s+", " ", makeflags, perl = TRUE))
-}
-
 R_CMD_config <- function(var) {
   tools::Rcmd(paste("config", var), stdout = TRUE)
 }
@@ -543,33 +535,12 @@ build_libarrow <- function(src_dir, dst_dir) {
     makeflags <- sprintf("-j%s", ncores)
     Sys.setenv(MAKEFLAGS = makeflags)
   } else {
-    # Extract -j/--jobs value from existing MAKEFLAGS if present
-    j_match <- regmatches(
-      makeflags,
-      regexpr("(^|\\s)(-j\\s*|--jobs(=|\\s)+|[[:alpha:]]*j)([0-9]+)(?=\\s|$)", makeflags, perl = TRUE)
-    )
+    # Extract -j value from existing MAKEFLAGS if present
+    j_match <- regmatches(makeflags, regexpr("-j\\s*([0-9]+)", makeflags, perl = TRUE))
     if (length(j_match) > 0) {
-      ncores <- as.integer(sub(".*?([0-9]+)$", "\\1", j_match, perl = TRUE))
+      ncores <- as.integer(sub("-j\\s*", "", j_match, perl = TRUE))
     }
-    # Keep GNU make's optional -j/--jobs argument in one token for nested gmake
-    makeflags <- gsub("(^|\\s)-j\\s+([0-9]+)(?=\\s|$)", "\\1-j\\2", makeflags, perl = TRUE)
-    makeflags <- gsub("(^|\\s)--jobs\\s+([0-9]+)(?=\\s|$)", "\\1--jobs=\\2", makeflags, perl = TRUE)
-    # Give any remaining bare `-j`/`--jobs` an explicit count
-    makeflags <- gsub("(^|\\s)-j(?=\\s|$)", sprintf("\\1-j%s", ncores), makeflags, perl = TRUE)
-    makeflags <- gsub("(^|\\s)--jobs(?=\\s|$)", sprintf("\\1--jobs=%s", ncores), makeflags, perl = TRUE)
-    Sys.setenv(MAKEFLAGS = makeflags)
-  }
-  gnumakeflags <- Sys.getenv("GNUMAKEFLAGS")
-  if (nzchar(gnumakeflags)) {
-    gnumakeflags <- gsub("(^|\\s)-j\\s+([0-9]+)(?=\\s|$)", "\\1-j\\2", gnumakeflags, perl = TRUE)
-    gnumakeflags <- gsub("(^|\\s)--jobs\\s+([0-9]+)(?=\\s|$)", "\\1--jobs=\\2", gnumakeflags, perl = TRUE)
-    gnumakeflags <- gsub("(^|\\s)-j(?=\\s|$)", sprintf("\\1-j%s", ncores), gnumakeflags, perl = TRUE)
-    gnumakeflags <- gsub("(^|\\s)--jobs(?=\\s|$)", sprintf("\\1--jobs=%s", ncores), gnumakeflags, perl = TRUE)
-    Sys.setenv(GNUMAKEFLAGS = gnumakeflags)
   }
-  makeflags <- strip_make_job_flags(makeflags)
-  gnumakeflags <- strip_make_job_flags(Sys.getenv("GNUMAKEFLAGS"))
-  Sys.setenv(MAKEFLAGS = makeflags, GNUMAKEFLAGS = gnumakeflags)
   if (!quietly) {
     lg("Building with MAKEFLAGS=%s", makeflags)
   }
@@ -608,8 +579,6 @@ build_libarrow <- function(src_dir, dst_dir) {
     ),
     # CXXFLAGS = R_CMD_config("CXX20FLAGS"), # We don't want the same debug symbols
     LDFLAGS = R_CMD_config("LDFLAGS"),
-    MAKEFLAGS = makeflags,
-    GNUMAKEFLAGS = gnumakeflags,
     N_JOBS = ncores
   )