Windows: support -tools-directory
#986
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@swift-ci please test |
artemcm
approved these changes
Jan 15, 2022
|
With all three patches now on GH: |
Un-hardcode the explicit target triple for the test. This allows the test to run on Windows where there is no `ld` (nor `ld.exe`). This then uncovers the fact that the windows toolchain did not honour `-tools-directory`. Fixing that uncovers the fact that the lookup for the tool will fail as the empty file does not get identified as a binary. To work around that, we now emit a 97-byte PE binary that is correctly identified as a binary as the contents. This will never be executed and so should be fine to emit on all platforms. Note that the identified linker is different between Darwin and non-Darwin as the behaviour of the driver is different - non-Darwin uses clang, while Darwin uses `ld` (ld64) directly. Thanks to @artemcm for the discussion on how to fix this properly.
compnerd
force-pushed
the
tools-directory
branch
from
0637aa9 to
b26d836
Compare
|
@swift-ci please test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Un-hardcode the explicit target triple for the test. This allows the
test to run on Windows where there is no
ld(norld.exe). This thenuncovers the fact that the windows toolchain did not honour
-tools-directory. Fixing that uncovers the fact that the lookup forthe tool will fail as the empty file does not get identified as a
binary. To work around that, we now emit a 97-byte PE binary that is
correctly identified as a binary as the contents. This will never be
executed and so should be fine to emit on all platforms. Note that the
identified linker is different between Darwin and non-Darwin as the
behaviour of the driver is different - non-Darwin uses clang, while
Darwin uses
ld(ld64) directly.Thanks to @artemcm for the discussion on how to fix this properly.