Mesa (master): build: Convert git_sha1_gen script to Python (part2).
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Tue Aug 1 15:36:06 UTC 2017
Module: Mesa
Branch: master
Commit: d4b44783906d3dd37903525dd187c53f4bd26918
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d4b44783906d3dd37903525dd187c53f4bd26918
Author: Jose Fonseca <jfonseca at vmware.com>
Date: Tue Aug 1 14:36:16 2017 +0100
build: Convert git_sha1_gen script to Python (part2).
Things pointed out by Emil.
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
---
src/Makefile.am | 2 +-
src/mesa/Android.libmesa_git_sha1.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 8d7483fc75..e055cb8e70 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@
.PHONY: git_sha1.h.tmp
git_sha1.h.tmp:
- @python $(top_srcdir)/bin/git_sha1_gen.py > $@
+ @$(PYTHON2) $(top_srcdir)/bin/git_sha1_gen.py > $@
git_sha1.h: git_sha1.h.tmp
@echo "updating git_sha1.h"
diff --git a/src/mesa/Android.libmesa_git_sha1.mk b/src/mesa/Android.libmesa_git_sha1.mk
index f66f88484b..ddb30c428a 100644
--- a/src/mesa/Android.libmesa_git_sha1.mk
+++ b/src/mesa/Android.libmesa_git_sha1.mk
@@ -46,7 +46,7 @@ LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, git_sha1.h)
$(intermediates)/git_sha1.h: $(wildcard $(MESA_TOP)/.git/logs/HEAD)
@mkdir -p $(dir $@)
@echo "GIT-SHA1: $(PRIVATE_MODULE) <= git"
- $(hide) python $(MESA_TOP)/bin/git_sha1_gen.py > $@
+ $(hide) $(MESA_PYTHON2) $(MESA_TOP)/bin/git_sha1_gen.py > $@
LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
More information about the mesa-commit
mailing list