summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2017-08-14 08:59:11 +0200
committerTom Rini <trini@konsulko.com>2017-08-20 09:53:13 -0400
commit3809e30273e03d762595dbc2a62f3a8398281ec8 (patch)
treece5511e621b0fa490935dfb8506e3c23398e2830 /scripts
parent2629a21e209d91cdb778f43612235ed1f3029488 (diff)
downloadu-boot-3809e30273e03d762595dbc2a62f3a8398281ec8.tar.gz
Makefile: honor PYTHON configuration properly
On some systems `python` is `python3` (for instance, Archlinux). The `PYTHON` variable can be used to point to `python2` to have a successful build. The use of `PYTHON` is currently limited in the Makefile and needs to be extended in other places: First, pylibfdt is required to be a Python 2 binding (binman imports pylibfdt and is only compatible Python 2), so its setup.py needs to be called accordingly. An alternative would be to change the libfdt setup.py shebang to python2, but the binding is actually portable. Also, it would break on system where there is no such thing as `python2`. Secondly, the libfdt import checks need to be done against Python 2 as well since the Python 2 compiled modules (in this case _libdft.so) can not be imported from Python 3. Note on the libfdt imports: "@if ! PYTHONPATH=tools $(PYTHON) -c 'import libfdt'; then..." is probably simpler than the currently sub-optimal pipe. Reviewed-by: Jonathan Gray <jsg@jsg.id.au>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.spl2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index 3ba00077d3..dd8065d87d 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -369,7 +369,7 @@ ifneq ($(cmd_files),)
endif
checkdtoc: tools
- @if ! ( echo 'import libfdt' | ( PYTHONPATH=tools python )); then \
+ @if ! ( echo 'import libfdt' | ( PYTHONPATH=tools $(PYTHON) )); then \
echo '*** dtoc needs the Python libfdt library. Either '; \
echo '*** install it on your system, or try:'; \
echo '***'; \