Skip to content

Commit

Permalink
corrected syntax issues with tabs/spaces that crashed the process whe…
Browse files Browse the repository at this point in the history
…n encountering a warning, removed type -P method as it wasn't functionning within the shell call, added search for python3 if search for python failed
  • Loading branch information
FrederickDeny committed Feb 5, 2024
1 parent 55b6777 commit 045ba0c
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,23 @@ CONDA_BIN = $(CONDA_DEST)/bin
CONDA = $(CONDA_DEST)/bin/python

ifeq ($(USE_MINICONDA),true)
PYTHON_EXE = $(CONDA)
PYTHON_FLAGS = -EOu
PYTHON_EXE = $(CONDA)
PYTHON_FLAGS = -EOu
else
$(warning WARNING: There are no miniconda packages for this system: $(HOST_OS), $(HOST_ARCH).)
CONDA_SRC =
PYTHON_EXE = $(shell command -pv python || type -P python || which python)
PYTHON_FLAGS = -O
$(warning WARNING: There are no miniconda packages for this system: $(HOST_OS), $(HOST_ARCH).)
CONDA_SRC =
PYTHON_EXE = $(shell command -pv python || which python)
PYTHON_FLAGS = -O
ifeq ($(PYTHON_EXE),)
PYTHON_EXE = $(shell command -pv python3 || which python3)
ifeq ($(PYTHON_EXE),)
$(error python not found in PATH.)
else
$(warning WARNING: Trying to use '$(PYTHON_EXE)' instead.)
$(error python not found in PATH.)
endif
else
$(warning WARNING: Trying to use '$(PYTHON_EXE)' instead.)
endif
endif

PYTHON = $(PYTHON_EXE) $(PYTHON_FLAGS)

# Completion folder resolution from https://github.com/scop/bash-completion#faq
Expand Down

0 comments on commit 045ba0c

Please sign in to comment.