[wasm coreclr] Make clr.runtime+libs build on Windows #115058
Conversation
ghost
added
the
|
Tagging subscribers to this area: @hoyosjs |
radekdoulik
changed the title
| @@ -434,7 +434,7 @@ if(CLR_CMAKE_TARGET_OS STREQUAL haiku) | |||
| set(CLR_CMAKE_TARGET_HAIKU 1) | |||
| endif(CLR_CMAKE_TARGET_OS STREQUAL haiku) | |||
|
|
|||
| if(CLR_CMAKE_TARGET_OS STREQUAL emscripten) | |||
| if(CLR_CMAKE_TARGET_OS STREQUAL emscripten OR CLR_CMAKE_TARGET_OS STREQUAL browser) | |||
There was a problem hiding this comment.
why is this needed? I think we should be using emscripten here
There was a problem hiding this comment.
When I run build.cmd -os browser, the CLR_CMAKE_TARGET_OS is set to browser. Where is CLR_CMAKE_TARGET_OS set to emscripten? Maybe we should make it work similar on coreclr then?
There was a problem hiding this comment.
The emscripten toolchain sets CMAKE_SYSTEM_NAME to 'emscripten' and CLR_CMAKE_HOST_OS will pick that up by default. In mono, we aren't fully integrated with configureplatform.cmake and so we don't pass CLR_CMAKE_TARGET_OS like coreclr does. If it's not specified, it'll take the value of CLR_CMAKE_HOST_OS and that is 'emscripten'.
I think it might be better to set CLR_CMAKE_TARGET_OS to 'browser' in mono and let coreclr act normally.
| @@ -152,6 +154,7 @@ if /i "%1" == "-enforcepgo" (set __EnforcePgo=1&shift&goto Arg_Loop) | |||
| if /i "%1" == "-pgodatapath" (set __PgoOptDataPath=%~2&set __PgoOptimize=1&shift&shift&goto Arg_Loop) | |||
| if /i "%1" == "-component" (set __RequestedBuildComponents=%__RequestedBuildComponents%-%2&set "__remainingArgs=!__remainingArgs:*%2=!"&shift&shift&goto Arg_Loop) | |||
| if /i "%1" == "-fsanitize" (set __CMakeArgs=%__CMakeArgs% "-DCLR_CMAKE_ENABLE_SANITIZERS=%2"&shift&shift&goto Arg_Loop) | |||
| if /i "%1" == "-keepnativesymbols" (set __CMakeArgs=%__CMakeArgs% "-DCLR_CMAKE_KEEP_NATIVE_SYMBOLS=true"&shift&goto Arg_Loop) | |||
There was a problem hiding this comment.
I'd rather use #114466 for that instead.
There was a problem hiding this comment.
This way it is useful when you run the build-runtime scripts directly, to have faster roundtrip of runtime build. The build-runtime.sh already has this option.
There was a problem hiding this comment.
I don't think the batch gods are happy as the build fails locally for me with the ever clear The system cannot find the path specified.. The command line processing in this batch file can be brittle.
There was a problem hiding this comment.
How do you call it? It worked fine for me.
I will enable windows build on CI to see if it works there.
There was a problem hiding this comment.
.\build.cmd -Subset clr+libs -os browser -arch wasm
|
@steveisok @akoeplinger it is now green. Could we merge it as is or do you want some additional changes? |
No description provided.