fix(Makefile): use correct git shell path and add semicolons #1346
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
|
Hi! |
- Problem: PR L3MON4D3#1343 did not use the correct git shell path as the space is not escaped. - Solution: 1. Adding a backslash to escape the space does not fix the issue as `SHELL` still expands to `sh.exe` even after assignment. Instead of directly copying `$(WIN_GIT_SHELL)`, use `$(wildcard $(WIN_GIT_SHELL))` returned from the Makefile function to overwrite `SHELL`. 2. Similar to fixes on `$(shell %COMMAND%)`, semicolons are added after each command to make sure `make` can call `CreateProcess` correctly: - Without semicolon: calls `CreateProcess(NULL,%COMMAND%,...)` - With semicolon: calls `CreateProcess(NULL,$(SHELL) $(.SHELLFLAGS) "%COMMAND%;",...)`
|
Of course :) |
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.
Problem:
PR #1343 did not use the correct git shell path as the space is not escaped.
Solution:
Adding a backslash to escape the space does not fix the issue as
SHELLstill expands tosh.exeeven after assignment. Instead of directly copying$(WIN_GIT_SHELL), use$(wildcard $(WIN_GIT_SHELL))returned from the Makefile function to overwriteSHELL.Similar to PR feat(Makefile): enable auto detect compiler #1282 on
$(shell %COMMAND%), semicolons are added after each command to make suremakecan callCreateProcesscorrectly:CreateProcess(NULL,%COMMAND%,...)CreateProcess(NULL,$(SHELL) $(.SHELLFLAGS) "%COMMAND%;",...)