rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/parched/OP-1324_fix_build_when_python_isnt_python2' into next

Browse Source
This commit is contained in:
Corvus Corax 2014-08-16 13:53:16 +02:00
commit 4592de13bd
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/python.pri
View File

@ -15,7 +15,7 @@ OPENPILOT_TOOLS_DIR = $$(OPENPILOT_TOOLS_DIR)
PYTHON = \"$$ROOT_DIR/tools/$$PYTHON_DIR/python\" PYTHON = \"$$ROOT_DIR/tools/$$PYTHON_DIR/python\"
} else { } else {
# not found, hope it's in the path... # not found, hope it's in the path...
PYTHON = \"python\" PYTHON = $$(PYTHON)
} }
} }

6
make/tools.mk
View File

@ -690,7 +690,11 @@ ifeq ($(shell [ -d "$(PYTHON_DIR)" ] && $(ECHO) "exists"), exists)
else else
# not installed, hope it's in the path... # not installed, hope it's in the path...
# $(info $(EMPTY) WARNING $(call toprel, $(PYTHON_DIR)) not found, using system PATH) # $(info $(EMPTY) WARNING $(call toprel, $(PYTHON_DIR)) not found, using system PATH)
export PYTHON := python ifeq ($(findstring Python 2,$(shell python --version)), Python 2)
export PYTHON := python
else
export PYTHON := python2
endif
endif endif
.PHONY: python_version .PHONY: python_version