From aa8fc57f1e7683e0490fad5dc2fc18bdba2cee5b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 15 Feb 2016 19:01:28 +1100 Subject: Fix for Python executable not being found on Linux Python name could include ABI-flags after the version, since checking for all combinations of ABI flags can expand into many possibilities, take the executable name from the build system. --- source/blender/blenkernel/intern/appdir.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'source/blender/blenkernel/intern/appdir.c') diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c index dd961eacb58..de21d9105e2 100644 --- a/source/blender/blenkernel/intern/appdir.c +++ b/source/blender/blenkernel/intern/appdir.c @@ -597,10 +597,20 @@ bool BKE_appdir_program_python_search( char *fullpath, const size_t fullpath_len, const int version_major, const int version_minor) { +#ifdef PYTHON_EXECUTABLE_NAME + /* passed in from the build-systems 'PYTHON_EXECUTABLE' */ + const char *python_build_def = STRINGIFY(PYTHON_EXECUTABLE_NAME); +#endif const char *basename = "python"; char python_ver[16]; /* check both possible names */ - const char *python_names[] = {python_ver, basename}; + const char *python_names[] = { +#ifdef PYTHON_EXECUTABLE_NAME + python_build_def, +#endif + python_ver, + basename, + }; int i; bool is_found = false; -- cgit v1.2.3