diff options
| author | Emil Velikov <[email protected]> | 2018-08-16 13:59:38 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2018-10-31 19:15:50 +0000 |
| commit | 986033a2750c1160a4cef3c8418fc7f9e2b4fb5a (patch) | |
| tree | 272f346932d8d545e79213feeab07d610fa3dfbd /src/amd | |
| parent | 6d7d3dbda531b0bc692ffb479d65527b2138dbf3 (diff) | |
configure: allow building with python3
Pretty much all of the scripts are python2+3 compatible.
Check and allow using python3, while adjusting the PYTHON2 refs.
Note:
- python3.4 is used as it's the earliest supported version
- python2 chosen prior to python3
v2: use python2 by default
Cc: Ilia Mirkin <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Acked-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src/amd')
| -rw-r--r-- | src/amd/Makefile.common.am | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/Makefile.am | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/amd/Makefile.common.am b/src/amd/Makefile.common.am index d62e9d41cf4..453d23c3ac9 100644 --- a/src/amd/Makefile.common.am +++ b/src/amd/Makefile.common.am @@ -66,6 +66,6 @@ common_libamd_common_la_LIBADD = $(LIBELF_LIBS) common/sid_tables.h: $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h $(srcdir)/common/gfx9d.h $(AM_V_at)$(MKDIR_P) $(@D) - $(AM_V_GEN) $(PYTHON2) $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h $(srcdir)/common/gfx9d.h > $@ + $(AM_V_GEN) $(PYTHON) $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h $(srcdir)/common/gfx9d.h > $@ BUILT_SOURCES = $(AMD_GENERATED_FILES) diff --git a/src/amd/vulkan/Makefile.am b/src/amd/vulkan/Makefile.am index e28f032cbee..2522171dacf 100644 --- a/src/amd/vulkan/Makefile.am +++ b/src/amd/vulkan/Makefile.am @@ -140,7 +140,7 @@ vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml radv_entrypoints.c: radv_entrypoints_gen.py radv_extensions.py $(vulkan_api_xml) $(MKDIR_GEN) - $(AM_V_GEN)$(PYTHON2) $(srcdir)/radv_entrypoints_gen.py \ + $(AM_V_GEN)$(PYTHON) $(srcdir)/radv_entrypoints_gen.py \ --xml $(vulkan_api_xml) \ --outdir $(builddir) radv_entrypoints.h: radv_entrypoints.c @@ -148,7 +148,7 @@ radv_entrypoints.h: radv_entrypoints.c radv_extensions.c: radv_extensions.py \ $(vulkan_api_xml) $(MKDIR_GEN) - $(AM_V_GEN)$(PYTHON2) $(srcdir)/radv_extensions.py \ + $(AM_V_GEN)$(PYTHON) $(srcdir)/radv_extensions.py \ --xml $(vulkan_api_xml) \ --out-c radv_extensions.c \ --out-h radv_extensions.h @@ -157,7 +157,7 @@ radv_extensions.h: radv_extensions.c vk_format_table.c: vk_format_table.py \ vk_format_parse.py \ vk_format_layout.csv - $(PYTHON2) $(srcdir)/vk_format_table.py $(srcdir)/vk_format_layout.csv > $@ + $(PYTHON) $(srcdir)/vk_format_table.py $(srcdir)/vk_format_layout.csv > $@ BUILT_SOURCES = $(VULKAN_GENERATED_FILES) CLEANFILES = $(BUILT_SOURCES) dev_icd.json radeon_icd.@[email protected] @@ -190,11 +190,11 @@ icdconf_DATA = radeon_icd.@[email protected] noinst_DATA = dev_icd.json dev_icd.json : radv_extensions.py radv_icd.py - $(AM_V_GEN)$(PYTHON2) $(srcdir)/radv_icd.py \ + $(AM_V_GEN)$(PYTHON) $(srcdir)/radv_icd.py \ --lib-path="${abs_top_builddir}/${LIB_DIR}" --out $@ radeon_icd.@[email protected] : radv_extensions.py radv_icd.py - $(AM_V_GEN)$(PYTHON2) $(srcdir)/radv_icd.py \ + $(AM_V_GEN)$(PYTHON) $(srcdir)/radv_icd.py \ --lib-path="${libdir}" --out $@ include $(top_srcdir)/install-lib-links.mk |