From e2745ef7b842167f1040dc55de24acc09f6184e4 Mon Sep 17 00:00:00 2001 From: TJ Kolleh Date: Sun, 19 Apr 2026 18:49:34 -0400 Subject: [PATCH] fix(ci): use cmake --build . instead of make for luv On Windows (MSYS2), CMake defaults to the Ninja generator. Running 'make' after 'cmake .' caused the build to use luv's original Makefile instead of the CMake-generated build system. The original Makefile ran its own cmake command, ignoring our CMAKE_C_FLAGS (including the GCC 14+ pointer fix). Fixes: - Use 'cmake --build .' to build luv using the generated build system - Handle copying luv.dll on Windows instead of failing on luv.so --- justfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/justfile b/justfile index ecc3372..1bd4ee4 100644 --- a/justfile +++ b/justfile @@ -153,10 +153,10 @@ build-luv: prep @echo "Building static luv and shared module..." {{ if path_exists(build_dir / "luv") == "true" { "" } else { "git clone --recursive https://github.com/luvit/luv.git " + (build_dir / "luv") } }} cd {{ build_dir / 'luv' }} && cmake -DCMAKE_C_FLAGS="-Wno-error=incompatible-pointer-types" -DBUILD_MODULE=ON -DBUILD_STATIC_LIBS=ON -DWITH_LUA_ENGINE=Lua -DLUA_BUILD_TYPE=System -DLUA_INCLUDE_DIR={{ lua_include }} -DLUA_LIBRARIES={{ lua_lib }} {{ cmake_osx_arch_flag }} . - cd {{ build_dir / 'luv' }} && make + cd {{ build_dir / 'luv' }} && cmake --build . cp {{ build_dir / 'luv' / 'libluv.a' }} {{ build_dir }}/ cp {{ build_dir / 'luv' / 'deps' / 'libuv' / 'libuv.a' }} {{ build_dir }}/ - cp {{ build_dir / 'luv' / 'luv.so' }} {{ build_dir }}/ + cp {{ build_dir / 'luv' / 'luv.so' }} {{ build_dir }}/ 2>/dev/null || cp {{ build_dir / 'luv' / 'luv.dll' }} {{ build_dir }}/ 2>/dev/null || true [doc("Statically compile luasystem (GCC/AR)")] [group('build')]