Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix $(PYTHON) paths for native windows executable or cygwin #34984

Merged
merged 8 commits into from
Mar 4, 2020
Merged

Fix $(PYTHON) paths for native windows executable or cygwin #34984

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b06dd83
`$(PYTHON)` can be a native windows executable or a cygwin
staticfloat Mar 3, 2020
e73be94
Quoting
staticfloat Mar 3, 2020
f5e2dce
No lowercase yet
staticfloat Mar 3, 2020
b4e92e8
quoting
staticfloat Mar 3, 2020
b397325
Flip conditional
staticfloat Mar 3, 2020
aa6b2bc
`cygpath_w` isn't defined in time
staticfloat Mar 3, 2020
99e56d8
Delay invoke_python expansion
staticfloat Mar 3, 2020
0acf732
Get rid of extraneous `shell`
staticfloat Mar 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Get rid of extraneous shell
  • Loading branch information
@staticfloat
staticfloat committed Mar 3, 2020
commit 0acf732f5562f502089070cc7e295f82d6277e0c
2 changes: 1 addition & 1 deletion Make.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,7 +1018,7 @@ PYTHON_SYSTEM := $(shell $(PYTHON) -c 'from __future__ import print_function; im
# If we're running on Cygwin, but using a native-windows Python, we need to use cygpath -w
ifneq ($(and $(filter $(PYTHON_SYSTEM),Windows),$(findstring CYGWIN,$(BUILD_OS))),)
define invoke_python
$(PYTHON) "$$(shell cygpath -w "$(1)")"
$(PYTHON) "$$(cygpath -w "$(1)")"
endef
else
define invoke_python
Expand Down