Revert "SCons: Add CPPEXTPATH
for external includes"
#111331
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
CPPEXTPATH
for external includes (reverted) #104893Despite looking promising on-paper, this change proved to be much more trouble than it's worth. The reason for that was revealed when working on #108611, as it came down to SCons not tracking external includes properly. While that might've sufficed in isolation, this fix required a somewhat invasive and largely undocumented solution. Combined with it being in a stagnant/unreviewed state, the much safer option is to simply revert to the original implementation
This isn't a full revert, as there've been hotfixes surrounding this initial change since merging, so those are already applied. Beyond that, the sections that necessitated warning suppression pragmas now use the warning wrapper macros instead, as those would've been applied if they were still around
Note that this reimplements hardcoded
-isystem
flags to the repo, as those were around prior to this original PR. Meaning: the same issues thatCPPEXTPATH
revealed had already existed in the repo for many years, but either never came up or were addressed in an isolated context. As such, a followup PR will remove these as well, and apply the proper warning wrappers to the thirdparty includes as necessaryBugsquad edit:
CPPEXTPATH
for external includes (reverted) #104893 (comment)