Fix the check-for-missing-dlls build
#445
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
A recent GCC update made that library obsolete (it used to be required to make `-fstack-protector` work). However, we had not re-built `git.exe` with that newer GCC version, therefore we still needed to ship it. Now that Git v2.39.0-rc0 is available, we have a new `git.exe` that no longer requires `libssp-0.dll`, and since it was the last user of that library, now the `check-for-missing-dlls` check fails, complaining that the library should no longer be included. We have to be careful to keep the script working even when a `git.exe` is shipped that is built using an older GCC: every once in a blue moon, the Git for Windows project needs to release MinGit backports, and those are traditionally done using the very snapshot of the Git for Windows SDK with which that release train was started. And that snapshot will still have an older GCC. To accommodate for that, we do not simply exclude the `.dll` but ensure that the `git.exe` does not need it. If it needs it, we include it. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Currently there is only a non-intuitive way to check for missing DLLs in the MinGit flavor of Git for Windows. Let's add an intuitive way. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
With the upgrade to mingw-w64-git v2.39.0-rc0, this build started failing, see e.g. here.
The culprit is that pesky
libssp-0.dllwhich used to be required for-fstack-protector(i.e. GCC's stack-smashing protector), but is no longer needed when compiling with a newer mingw-w64-gcc.The fix is a little tricky because we essentially have to make sure that
git.exedoes not require thelibssp-0.dllbefore excluding that file.