VSadov/Satori
1
0
Fork 0
mirror of https://github.com/VSadov/Satori.git synced 2025-06-09 17:44:48 +09:00
Code Activity

Fix the definition of TARGET_BROWSER in CMake (#97254)

Browse source 
Without this change, put this in configurecompiler.cmake:
```
message("CLR_CMAKE_TARGET_UNIX: ${CLR_CMAKE_TARGET_UNIX}, CLR_CMAKE_TARGET_LINUX: ${CLR_CMAKE_TARGET_LINUX}, CLR_CMAKE_TARGET_BROWSER: ${CLR_CMAKE_TARGET_BROWSER}")
```

Run:
```
$env:EMSDK_PATH=...
./build libs.native -a wasm -os browser
```

Observe:
```
CLR_CMAKE_TARGET_UNIX: 1, CLR_CMAKE_TARGET_LINUX: , CLR_CMAKE_TARGET_BROWSER: 1
```

Also adds the corresponding HOST defines for consistency.
This commit is contained in:
SingleAccretion 2024-01-24 19:04:44 +03:00 • committed by GitHub
parent d3583b8360
commit 5342824129
Signed by: github
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
eng/native/configurecompiler.cmake
View file

@ -425,8 +425,12 @@ if (CLR_CMAKE_HOST_UNIX)
message("Detected SunOS amd64")
elseif(CLR_CMAKE_HOST_HAIKU)
message("Detected Haiku x86_64")
endif(CLR_CMAKE_HOST_OSX OR CLR_CMAKE_HOST_MACCATALYST)
endif(CLR_CMAKE_HOST_UNIX)
elseif(CLR_CMAKE_HOST_BROWSER)
add_definitions(-DHOST_BROWSER)
endif()
elseif(CLR_CMAKE_HOST_WASI)
add_definitions(-DHOST_WASI)
endif()
if (CLR_CMAKE_HOST_WIN32)
add_definitions(-DHOST_WINDOWS)
@ -705,9 +709,6 @@ if(CLR_CMAKE_TARGET_UNIX)
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_OS>>>:TARGET_ANDROID>)
elseif(CLR_CMAKE_TARGET_LINUX)
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_OS>>>:TARGET_LINUX>)
if(CLR_CMAKE_TARGET_BROWSER)
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_OS>>>:TARGET_BROWSER>)
endif()
if(CLR_CMAKE_TARGET_LINUX_MUSL)
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_OS>>>:TARGET_LINUX_MUSL>)
endif()
@ -721,6 +722,9 @@ if(CLR_CMAKE_TARGET_UNIX)
elseif(CLR_CMAKE_TARGET_HAIKU)
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_OS>>>:TARGET_HAIKU>)
endif()
if(CLR_CMAKE_TARGET_BROWSER)
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_OS>>>:TARGET_BROWSER>)
endif()
elseif(CLR_CMAKE_TARGET_WASI)
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_OS>>>:TARGET_WASI>)
else(CLR_CMAKE_TARGET_UNIX)