Skip to content

Commit

Permalink
Do not pass MAKEFLAGS through. We might be using incompatible Makes.
Browse files Browse the repository at this point in the history
  • Loading branch information
elliottslaughter committed Jun 22, 2024
1 parent a3005ab commit d9ade7e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmake/Modules/GetLuaJIT.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit d9ade7e

Please sign in to comment.