Fix binplacing WASM files for in-tree runtime pack#36985
Conversation
|
Tagging subscribers to this area: @ViktorHofer |
It got broken by dotnet#36781.
| PINVOKE_TABLE?=$(TOP)/artifacts/obj/mono/Browser.wasm.$(CONFIG)/wasm/pinvoke-table.h | ||
| MONO_BIN_DIR?=$(BINDIR)/mono/Browser.wasm.$(CONFIG) | ||
| SYS_NATIVE_DIR?=$(BINDIR)/native/net5.0-Browser-$(CONFIG)-wasm/ | ||
| SYS_NATIVE_DIR?=$(OBJDIR)/native/net5.0-Browser-$(CONFIG)-wasm/System.Native |
There was a problem hiding this comment.
Still not sure why we explicitly list only this native lib
There was a problem hiding this comment.
Eventually we'll need all of them but right now it's the only native lib we use. This will need to be refactored into proper msbuild anyway.
| <ItemGroup Condition="'$(PackageRID)' != ''"> | ||
| <LibrariesRuntimeFiles Condition="'%(IsNative)' != 'true'" TargetPath="runtimes/$(PackageRID)/lib/$(NetCoreAppCurrent)" /> | ||
| <LibrariesRuntimeFiles Condition="'%(IsNative)' == 'true'" TargetPath="runtimes/$(PackageRID)/native/%(RecursiveDir)" /> | ||
| <LibrariesRuntimeFiles Condition="'%(IsNative)' == 'true'" TargetPath="runtimes/$(PackageRID)/native/%(LibrariesRuntimeFiles.NativeSubDirectory)%(RecursiveDir)" /> |
There was a problem hiding this comment.
Took me a while to understand what this is doing. You might want to add a comment.
There was a problem hiding this comment.
Yeah though that applies to all of this build logic, it's pretty hard to understand without spending a lot of time looking at build flows in the binlog. 😄
There was a problem hiding this comment.
Will merge to unblock wasm and add the comment in another PR.
ghost
locked as resolved and limited conversation to collaborators
6 participants
It got broken by #36781