Skip to content

Commit f34d4d9

Browse files
authored
Merge pull request #4792 from gudeh/fix-make-issue
fix make issue PYTHON_EXE
2 parents b19abe9 + 70648fe commit f34d4d9

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

‎flow/util/generate-vars.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ EXCLUDED_VARS+='|COMMAND_LINE_ARGS'
1616
EXCLUDED_PATTERNS="_EXE$|PATH$|_CMD$|\."
1717

1818
echo 'export FLOW_HOME=${FLOW_HOME:-$(pwd)}' > $1.sh
19+
# *_EXE paths are machine specific and excluded below; default to PATH lookup.
20+
echo 'export PYTHON_EXE=${PYTHON_EXE:-python3}' >> $1.sh
21+
echo 'if { ![info exists env(PYTHON_EXE)] } { set env(PYTHON_EXE) python3 }' > $1.tcl
1922

2023
while read -r VAR; do
2124
if [[ ${VAR} != *"="* ]] ; then

‎flow/util/makeIssue.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ cat > ${RUN_ME_SCRIPT} <<EOF
8989
#!/usr/bin/env bash
9090
cd "\$(dirname "\$0")"
9191
source ./$(basename ${VARS_BASENAME}).sh
92-
export PYTHON_EXE=\${PYTHON_EXE:-\$(command -v python3)}
9392
yosys ${YOSYS_FLAGS:-} -c \${SCRIPTS_DIR}/${ISSUE_TARGET}.tcl
9493
EOF
9594
else

0 commit comments

Comments
 (0)