starred/brotli
1
0
Fork 0
mirror of https://github.com/google/brotli.git synced 2026-07-08 17:56:58 +00:00
Code Issues 1.2k Packages Projects Releases 20 Wiki Activity

Fix Emscripten detection false positives and unsuppressible status messages

Browse Source 
Issue 1: False positive Emscripten detection

The check_c_source_compiles() test incorrectly detected Emscripten when
building with non-Emscripten WASM toolchains (e.g., WASI SDK). In cross-
compilation scenarios, CMake creates a static library instead of an
executable for compile tests. An empty source file (when __EMSCRIPTEN__
is not defined) successfully archives into a static library, causing the
test to pass when it should fail.

Resolution: Use the EMSCRIPTEN CMake variable set by Emscripten's official
toolchain file, which is the recommended detection method. Remove the
unreliable check_c_source_compiles() fallback.

Issue 2: Unsuppressible status messages

The message() calls lacked a type argument, making them always print
regardless of CMake's log level settings.

Resolution: Add STATUS type to message() calls so they can be suppressed
with CMake's --log-level option.
This commit is contained in:
Justin Graham
2025-12-10 06:54:23 -08:00
parent 5fa73e23be
commit 7607185e26
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
CMakeLists.txt
View File

@@ -17,17 +17,23 @@ else()
message(STATUS "Build type is '${CMAKE_BUILD_TYPE}'") message(STATUS "Build type is '${CMAKE_BUILD_TYPE}'")
endif() endif()
include(CheckCSourceCompiles) # Detect Emscripten compiler.
check_c_source_compiles( # The EMSCRIPTEN variable is set by Emscripten's CMake toolchain file and is
"#if defined(__EMSCRIPTEN__) # the recommended way to detect Emscripten builds.
int main() {return 0;} #
#endif" # Note: Previously this used check_c_source_compiles() to test for the
BROTLI_EMSCRIPTEN # __EMSCRIPTEN__ macro, but that approach is unreliable in cross-compilation
) # scenarios where CMake links a static library instead of an executable,
if (BROTLI_EMSCRIPTEN) # causing false positives for non-Emscripten WASM toolchains (e.g., WASI SDK).
message("-- Compiler is EMSCRIPTEN") if (EMSCRIPTEN)
set(BROTLI_EMSCRIPTEN TRUE)
else() else()
message("-- Compiler is not EMSCRIPTEN") set(BROTLI_EMSCRIPTEN FALSE)
endif()
if (BROTLI_EMSCRIPTEN)
message(STATUS "Compiler is EMSCRIPTEN")
else()
message(STATUS "Compiler is not EMSCRIPTEN")
endif() endif()
if (BROTLI_EMSCRIPTEN) if (BROTLI_EMSCRIPTEN)