summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cmake/QtBaseConfigureTests.cmake11
1 files changed, 11 insertions, 0 deletions
diff --git a/cmake/QtBaseConfigureTests.cmake b/cmake/QtBaseConfigureTests.cmake
index ffa5019ca0..34e4e6e6f1 100644
--- a/cmake/QtBaseConfigureTests.cmake
+++ b/cmake/QtBaseConfigureTests.cmake
@@ -3,9 +3,20 @@ function(run_config_test_architecture)
set(qt_base_configure_tests_vars_to_export)
# Test architecture
set(_arch_file "${CMAKE_CURRENT_BINARY_DIR}/architecture_test")
+ set(saved_executable_suffix "${CMAKE_EXECUTABLE_SUFFIX}")
+
+ # With emscripten the application entry point is a .js file (to be run with node for example), but the
+ # real "data" is in the .wasm file, so that's where we need to look for the ABI, etc. information.
+ if (EMSCRIPTEN)
+ set(CMAKE_EXECUTABLE_SUFFIX ".wasm")
+ endif()
+
try_compile(_arch_result "${CMAKE_CURRENT_BINARY_DIR}"
"${CMAKE_CURRENT_SOURCE_DIR}/config.tests/arch/arch.cpp"
COPY_FILE "${_arch_file}")
+
+ set(CMAKE_EXECUTABLE_SUFFIX "${saved_executable_suffix}")
+
if (NOT _arch_result)
message(FATAL_ERROR "Failed to compile architecture detection file.")
endif()