Skip to content

build: luajit-cmake: Clean up MSVC cross-compiling #10417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cosmo0920 wants to merge 1 commit into from
Closed

build: luajit-cmake: Clean up MSVC cross-compiling #10417

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions lib/luajit-cmake/LuaJIT.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,12 @@ if(WIN32 OR MINGW)
set(DASM_FLAGS ${DASM_FLAGS} -D WIN)
endif()

set(ARM64_MSVC 0)
set(ARM64_CROSS_MSVC 0)
if (MSVC)
if ("${LJ_DETECTED_ARCH}" STREQUAL "AArch64" AND
"${CMAKE_SYSTEM_PROCESSOR}" STREQUAL ARM64)
set(ARM64_MSVC 1)
message(STATUS "Compiling for ARM64 with MSVC: ${ARM64_MSVC}")
set(ARM64_CROSS_MSVC 1)
message(STATUS "Compiling for ARM64 with MSVC: ${ARM64_CROSS_MSVC}")
endif()
endif()

Expand Down Expand Up @@ -388,15 +388,13 @@ endif()
set(VM_DASC_PATH ${LJ_DIR}/vm_${DASM_ARCH}.dasc)

# Build the minilua for host platform
if(NOT CMAKE_CROSSCOMPILING)
if((NOT CMAKE_CROSSCOMPILING) OR ARM64_CROSS_MSVC)
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/host/minilua)
set(MINILUA_PATH $<TARGET_FILE:minilua>)
else()
make_directory(${CMAKE_CURRENT_BINARY_DIR}/minilua)
if (HOST_WINE)
set(MINILUA_PATH ${CMAKE_CURRENT_BINARY_DIR}/minilua/minilua.exe)
elseif(ARM64_MSVC)
set(MINILUA_PATH ${CMAKE_CURRENT_BINARY_DIR}/minilua/Debug/minilua)
else()
set(MINILUA_PATH ${CMAKE_CURRENT_BINARY_DIR}/minilua/minilua)
endif()
Expand Down Expand Up @@ -478,16 +476,12 @@ if(HOST_WINE)
set(BUILDVM_EXE buildvm.exe)
endif()

if(NOT CMAKE_CROSSCOMPILING)
if((NOT CMAKE_CROSSCOMPILING) OR ARM64_CROSS_MSVC)
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/host/buildvm)
set(BUILDVM_PATH $<TARGET_FILE:buildvm>)
add_dependencies(buildvm buildvm_arch_h)
else()
if (NOT ARM64_MSVC)
set(BUILDVM_PATH ${CMAKE_CURRENT_BINARY_DIR}/buildvm/${BUILDVM_EXE})
else()
set(BUILDVM_PATH ${CMAKE_CURRENT_BINARY_DIR}/buildvm/Debug/${BUILDVM_EXE})
endif()
set(BUILDVM_PATH ${CMAKE_CURRENT_BINARY_DIR}/buildvm/${BUILDVM_EXE})

make_directory(${CMAKE_CURRENT_BINARY_DIR}/buildvm)

Expand Down
Loading