-
-
Notifications
You must be signed in to change notification settings - Fork 22k
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
Do not use relative includes for generated headers. #78342
Conversation
The issue reported by CI should be fixed now, but this requires a reapproval so the test suite is run again. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@akien-mga Looks good? But I don't understand how we got here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Makes sense to me, and the code looks correct.
I'm not fond of reverting that change, as it goes against the goal of making platform ports self-contained and modular, enabling easy plug 'n compile behavior for new / thirdparty platform ports. We have other places with relative include paths for
If it's only the |
Done with #78435, let me know if that solves the issue for the Meson port. |
Should be superseded by #78435, but let me know if that's not sufficient and we can rediscuss further changes. |
This commit changed the way includes are done. This causes a problem with generated headers because the include directives now look like this;
This forces the header to be relative to this source file, i.e. it has to be inside the source directory. This works fine with SCons because it does in-tree builds and writes the
.gen.h
files inside the source tree. This causes problems for the Meson port, which writes all generated files in a separate build directory so this include directive can not really work.This patch restores the old behaviour that works with both systems but only for files that are generated during the build.