-
Notifications
You must be signed in to change notification settings - Fork 4.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[wasm] Fix order of include paths, to have the obj dir first #50303
Conversation
Tagging subscribers to 'arch-wasm': @lewing Issue Detailsthis regressed recently, and we started using
|
I'll add a test for this once #49398 is merged. |
Maybe we should rename those files, and include them inside an ifdef to prevent this from happening. |
I'm pretty sure pinvoke-table.h is the renamed file, but for some reason it is also in the runtime pack (along side pinvoke.h) |
So, should we:
|
I looked closer and it appears I was wrong. If we want to rename that is fine, double check what is happening with the icall tables as well. |
this regressed recently, and we started using `pinvoke-table.h`, and `icall-table.h` from the runtime pack instead of from the obj dir.
`pinvoke-table.h` is generated when building the native files for wasm. They are not required in the runtime pack, as any wasm app build needing to do native relinking would be generating one of it's own.
5ffacdd
to
9b55857
Compare
IIUC, So, I removed it from the runtime pack, and the rename shouldn't be needed. |
* upstream/main: (568 commits) [wasm] Set __DistroRid on Windows to browser-wasm (dotnet#50842) [wasm] Fix order of include paths, to have the obj dir first (dotnet#50303) [wasm] Fix debug build of AOT cross compiler (dotnet#50418) Fix outdated comment (dotnet#50834) [wasm][tests] Add properties to allow passing args to xharness (dotnet#50678) Vectorized common String.Split() paths (dotnet#38001) Fix binplacing symbol files. (dotnet#50819) Move type check to after the null ref branch in out marshalling of blittable classes. (dotnet#50735) Remove extraneous CMake version requirement. (dotnet#50805) [wasm] Remove unncessary condition for EMSDK (dotnet#50810) Add loop alignment stats to JitLogCsv (dotnet#50624) Resolve ILLink warnings in System.Diagnostics.DiagnosticSource (dotnet#50265) Avoid unnecessary closures/delegates in Process (dotnet#50496) Fix for field layout verification across version bubble boundary (dotnet#50364) JIT: Enable CSE for VectorX.Create (dotnet#50644) [main] Update dependencies from mono/linker (dotnet#50779) [mono] More domain cleanup (dotnet#50771) Race condition in Mock reference tracker runtime with GC. (dotnet#50804) Remove IAssemblyName (and various fusion remnants) (dotnet#50755) Disable failing test for GCStress. (dotnet#50828) ...
this regressed recently, and we started using
pinvoke-table.h
, andicall-table.h
from the runtime pack instead of from the obj dir.To fix:
pinvoke-table.h
should not be included in the runtime pack anyway, so remove that