ClangImporter: expand -sdk appropriately on Windows
#15148
Conversation
|
@swift-ci please test |
|
Build failed |
|
Build failed |
lib/ClangImporter/ClangImporter.cpp
Outdated
| if (triple.isOSDarwin()) { | ||
| invocationArgStrs.push_back("-isysroot"); | ||
| if (triple.isWindowsMSVCEnvironment()) { | ||
| llvm::SmallString<261> path; |
There was a problem hiding this comment.
Where did this oddly specific number come from?
There was a problem hiding this comment.
"In the Windows API (with some exceptions...), the maximum length for a path is MAX_PATH, which is defined as 260 characters."
There was a problem hiding this comment.
261 is MAX_PATH + 1, which is pretty much the default size used for path buffers on Windows (the +1 is to ensure null-termination).
There was a problem hiding this comment.
Can you put that in instead, then?
|
@swift-ci please test |
|
Build failed |
|
Build failed |
jrose-apple
changed the title
-sdk appropriately on Windows-sdk appropriately on Windows
|
@swift-ci please test |
|
Build failed |
|
Build failed |
|
@jrose-apple ugh, we can't do that because |
The MSVC environment does not have a `-isysroot` or `-sysroot` equivalent. Instead, manually expand the sysroot to the path as a prefix to `/usr/include` and treat the path as a system include directory. This fixes a number of tests which use `-sdk` on Windows.
|
@swift-ci please test |
|
Build failed |
|
Build failed |
|
Oh, right, cross-compilation is a thing, so even conditionally-including Windows.h would be wrong. Okay, a comment is fine. |
|
@swift-ci please test and merge |
The MSVC environment does not have a
-isysrootor-sysrootequivalent. Instead, manually expand the sysroot to the path as a
prefix to
/usr/includeand treat the path as a system includedirectory. This fixes a number of tests which use
-sdkon Windows.Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.
Resolves SR-NNNN.