Fix $(PYTHON) paths for native windows executable or cygwin
#34984
Conversation
This file contains 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
We auto-detect by inspecting the output of `platform.system()`
staticfloat
changed the title
$(PYTHON) can be a native windows executable or a cygwin$(PYTHON) paths for native windows executable or cygwin
Keno
reviewed
Mar 3, 2020
Make.inc
Outdated
| @@ -1013,13 +1013,23 @@ endif | |||
| # We need python for things like BB triplet recognition. We don't really care | |||
| # about version, generally, so just find something that works: | |||
| PYTHON := $(shell which python 2>/dev/null || which python3 2>/dev/null || which python2 2>/dev/null || echo not found) | |||
| PYTHON_SYSTEM := $(PYTHON) -c 'from __future__ import print_function; import platform; print(platform.system())' | |||
| ifneq ($(filter $(call lowercase,$(PYTHON_SYSTEM)),cygwin),) | |||
vtjnash
approved these changes
Mar 3, 2020
vtjnash
reviewed
Mar 3, 2020
Make.inc
Outdated
| # 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)")" |
There was a problem hiding this comment.
Suggested change
| $(PYTHON) "$(shell cygpath -w "$(1)")" | |
| $(PYTHON) "$${cygpath -w \"$(1)\"}" |
There was a problem hiding this comment.
I'm not sure what the curly braces here mean? Delaying the expansion seems right though.
There was a problem hiding this comment.
They're the same as backticks for the shell
There was a problem hiding this comment.
I get "bad substitution" when I try that, because the $$ escapes it all the way down to bash. Here's an example:
$ cat Makefile
define foo
echo $${echo $(1) | grep b}
endef
all:
$(call foo,bar)
$ make
echo ${echo bar | grep b}
/bin/sh: ${echo bar | grep b}: bad substitution
make: *** [all] Error 1
I think it's sufficient to just use $$(cygpath -w ...).
KristofferC
pushed a commit
that referenced
this pull request
Mar 4, 2020
ravibitsgoa
pushed a commit
to ravibitsgoa/julia
that referenced
this pull request
Apr 9, 2020
KristofferC
pushed a commit
that referenced
this pull request
Apr 11, 2020
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.
We auto-detect by inspecting the output of
platform.system()