From d9ade7ed40a0b1e11b2e094e5281186939b28f31 Mon Sep 17 00:00:00 2001
From: Elliott Slaughter <slaughter@cs.stanford.edu>
Date: Fri, 21 Jun 2024 21:22:36 -0700
Subject: [PATCH] Do not pass MAKEFLAGS through. We might be using incompatible
 Makes.

---
 .cirrus.yml                   | 2 +-
 cmake/Modules/GetLuaJIT.cmake | 2 +-
 travis.sh                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index bbf07d7e..cf7f9790 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -2,7 +2,7 @@ freebsd_task:
   name: FreeBSD
   freebsd_instance:
     matrix:
-      image_family: freebsd-13-3
+      image_family: freebsd-14-0
   env:
     matrix:
       LLVM_VERSION: 11
diff --git a/cmake/Modules/GetLuaJIT.cmake b/cmake/Modules/GetLuaJIT.cmake
index c977e087..207b1759 100644
--- a/cmake/Modules/GetLuaJIT.cmake
+++ b/cmake/Modules/GetLuaJIT.cmake
@@ -162,7 +162,7 @@ else()
     DEPENDS ${LUAJIT_SOURCE_DIR}
     # MACOSX_DEPLOYMENT_TARGET is a workaround for https://github.com/LuaJIT/LuaJIT/issues/484
     # see also https://github.com/LuaJIT/LuaJIT/issues/575
-    COMMAND ${MAKE_EXE} install "PREFIX=${LUAJIT_INSTALL_PREFIX}" "CC=${CMAKE_C_COMPILER}" "STATIC_CC=${CMAKE_C_COMPILER} -fPIC" CCDEBUG=$<$<CONFIG:Debug>:-g> XCFLAGS=-DLUAJIT_ENABLE_GC64 MACOSX_DEPLOYMENT_TARGET=10.7
+    COMMAND ${CMAKE_COMMAND} -E env --unset=MAKEFLAGS ${MAKE_EXE} install "PREFIX=${LUAJIT_INSTALL_PREFIX}" "CC=${CMAKE_C_COMPILER}" "STATIC_CC=${CMAKE_C_COMPILER} -fPIC" CCDEBUG=$<$<CONFIG:Debug>:-g> XCFLAGS=-DLUAJIT_ENABLE_GC64 MACOSX_DEPLOYMENT_TARGET=10.7
     WORKING_DIRECTORY ${LUAJIT_SOURCE_DIR}
     VERBATIM
   )
diff --git a/travis.sh b/travis.sh
index 1b7b866d..5670ba3e 100755
--- a/travis.sh
+++ b/travis.sh
@@ -161,7 +161,7 @@ cmake .. -DCMAKE_INSTALL_PREFIX=$PWD/../install "${CMAKE_FLAGS[@]}"
 if [[ $(uname) = MINGW* ]]; then
   cmake --build . --target INSTALL --config Release
 else
-  make install VERBOSE=1 -j${THREADS:-2}
+  make install -j${THREADS:-2}
 fi
 
 # Skip ctest on Windows; this is currently broken.