Update to newer FreeBSD image and fix build (#667)

terralang · Jun 22, 2024 · 7c14775 · 7c14775
1 parent af046fb
commit 7c14775
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -2,8 +2,7 @@ freebsd_task:
   name: FreeBSD
   freebsd_instance:
     matrix:
-      image_family: freebsd-13-2
-      # image_family: freebsd-12-3
+      image_family: freebsd-14-0
   env:
     matrix:
       LLVM_VERSION: 11
@@ -13,6 +12,7 @@ freebsd_task:
       LLVM_VERSION: 15
       LLVM_VERSION: 16
       LLVM_VERSION: 17
+      LLVM_VERSION: 18
   install_script: pkg install -y bash coreutils cmake gmake llvm$LLVM_VERSION
   script: |
     export CC=cc

diff --git 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
   )