2 files changed, 15 insertions, 10 deletions
diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake
index 8ab04cf87b..7f038c732d 100644
--- a/third-party/cmake/BuildLuarocks.cmake
+++ b/third-party/cmake/BuildLuarocks.cmake
@@ -129,20 +129,12 @@ add_custom_command(OUTPUT ${ROCKS_DIR}/lpeg
 add_custom_target(lpeg DEPENDS ${ROCKS_DIR}/lpeg)
 list(APPEND THIRD_PARTY_DEPS lpeg)
 
-# inspect
-add_custom_command(OUTPUT ${ROCKS_DIR}/inspect
-  COMMAND ${LUAROCKS_BINARY}
-  ARGS build inspect 3.1.1-0 ${LUAROCKS_BUILDARGS}
-  DEPENDS lpeg)
-add_custom_target(inspect DEPENDS ${ROCKS_DIR}/inspect)
-list(APPEND THIRD_PARTY_DEPS inspect)
-
 if((NOT USE_BUNDLED_LUAJIT) AND USE_BUNDLED_LUA)
   # luabitop
   add_custom_command(OUTPUT ${ROCKS_DIR}/luabitop
     COMMAND ${LUAROCKS_BINARY}
     ARGS build luabitop 1.0.2-3 ${LUAROCKS_BUILDARGS}
-    DEPENDS inspect)
+    DEPENDS lpeg)
   add_custom_target(luabitop DEPENDS ${ROCKS_DIR}/luabitop)
   list(APPEND THIRD_PARTY_DEPS luabitop)
 endif()
@@ -151,7 +143,7 @@ if(USE_BUNDLED_BUSTED)
   if((NOT USE_BUNDLED_LUAJIT) AND USE_BUNDLED_LUA)
     set(PENLIGHT_DEPENDS luabitop)
   else()
-    set(PENLIGHT_DEPENDS inspect)
+    set(PENLIGHT_DEPENDS lpeg)
   endif()
 
   # penlight
diff --git a/third-party/cmake/BuildLuv.cmake b/third-party/cmake/BuildLuv.cmake
index 9f8e4bbc4f..967e0a1711 100644
--- a/third-party/cmake/BuildLuv.cmake
+++ b/third-party/cmake/BuildLuv.cmake
@@ -71,6 +71,19 @@ set(LUV_CONFIGURE_COMMAND_COMMON
   -DBUILD_SHARED_LIBS=OFF
   -DBUILD_MODULE=OFF)
 
+if(USE_BUNDLED_LUAJIT)
+  list(APPEND LUV_CONFIGURE_COMMAND_COMMON -DWITH_LUA_ENGINE=LuaJit)
+elseif(USE_BUNDLED_LUA)
+  list(APPEND LUV_CONFIGURE_COMMAND_COMMON -DWITH_LUA_ENGINE=Lua)
+else()
+  find_package(LuaJit)
+  if(LUAJIT_FOUND)
+    list(APPEND LUV_CONFIGURE_COMMAND_COMMON -DWITH_LUA_ENGINE=LuaJit)
+  else()
+    list(APPEND LUV_CONFIGURE_COMMAND_COMMON -DWITH_LUA_ENGINE=Lua)
+  endif()
+endif()
+
 if(USE_BUNDLED_LIBUV)
   set(LUV_CONFIGURE_COMMAND_COMMON
     ${LUV_CONFIGURE_COMMAND_COMMON}