diff options
| author | Christopher Degawa <ccom@randomderp.com> | 2023-10-04 13:42:44 -0500 |
|---|---|---|
| committer | Charles Giessen <46324611+charles-lunarg@users.noreply.github.com> | 2023-10-05 16:44:15 -0600 |
| commit | 25c552731e7e81b8409d972993c8140c0c6f0d3d (patch) | |
| tree | 00cea09c652a449af44e70beea2de88a4bb37831 | |
| parent | 7417583fc4607f2f35eb0f2d57b378cacca0e4e3 (diff) | |
| download | Vulkan-Loader-25c552731e7e81b8409d972993c8140c0c6f0d3d.tar.gz Vulkan-Loader-25c552731e7e81b8409d972993c8140c0c6f0d3d.tar.bz2 Vulkan-Loader-25c552731e7e81b8409d972993c8140c0c6f0d3d.zip | |
loader: Add check for working MASM compiler
CMake's detection of MASM is very broken, especially if not using MSVC.
This adds a check to see if MASM is working, and if not, disables it,
going back to the fallback path, as intended.
Signed-off-by: Christopher Degawa <ccom@randomderp.com>
| -rw-r--r-- | loader/CMakeLists.txt | 41 |
1 files changed, 35 insertions, 6 deletions
diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index 28000121..4cb11472 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -134,13 +134,42 @@ if(WIN32) if (USE_MASM) enable_language(ASM_MASM) endif() + # Test if the detected compiler actually works. + # Unfortunately, CMake's detection of ASM_MASM is not reliable, so we need to do this ourselves. + if (CMAKE_SIZEOF_VOID_P EQUAL 4) + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/masm_check.asm [=[ +.model flat +.code +extrn _start:near + xor eax, eax + ret +end +]=]) + else() + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/masm_check.asm [=[ +.code +extrn start:near + xor rax, rax + ret +end +]=]) + endif () + if(MINGW) + set(CMAKE_ASM_MASM_FLAGS ${CMAKE_ASM_MASM_FLAGS} ${JWASM_FLAGS}) + elseif(NOT CMAKE_CL_64 AND NOT JWASM_FOUND) + set(CMAKE_ASM_MASM_FLAGS ${CMAKE_ASM_MASM_FLAGS} /safeseh) + endif() + # try_compile does not work here due to the same reasons as static above. + execute_process(COMMAND ${CMAKE_ASM_MASM_COMPILER} ${CMAKE_ASM_MASM_FLAGS} -c -Fo ${CMAKE_CURRENT_BINARY_DIR}/masm_check.obj ${CMAKE_CURRENT_BINARY_DIR}/masm_check.asm + RESULT_VARIABLE CMAKE_ASM_MASM_COMPILER_WORKS + OUTPUT_QUIET ERROR_QUIET) + # Convert the return code to a boolean + if(CMAKE_ASM_MASM_COMPILER_WORKS EQUAL 0) + set(CMAKE_ASM_MASM_COMPILER_WORKS true) + else() + set(CMAKE_ASM_MASM_COMPILER_WORKS false) + endif() if(CMAKE_ASM_MASM_COMPILER_WORKS) - if(MINGW) - set(CMAKE_ASM_MASM_FLAGS ${CMAKE_ASM_MASM_FLAGS} ${JWASM_FLAGS}) - elseif(NOT CMAKE_CL_64 AND NOT JWASM_FOUND) - set(CMAKE_ASM_MASM_FLAGS ${CMAKE_ASM_MASM_FLAGS} /safeseh) - endif() - add_executable(asm_offset asm_offset.c) target_link_libraries(asm_offset PRIVATE loader_specific_options) # If am emulator is provided (Like Wine), or running on native, run asm_offset to generate gen_defines.asm |