From 008bd1f6d1d97aa5127702f9b9b44782e938d68a Mon Sep 17 00:00:00 2001 From: Ilsoo Byun Date: Fri, 6 Sep 2019 13:50:31 +0900 Subject: [PATCH] build/ops: fix build fail related to PYTHON_EXECUTABLE variable Fixes: https://tracker.ceph.com/issues/41676 Signed-off-by: Ilsoo Byun (cherry picked from commit d8251aa2139b75452371409c1bd27fec2f7f1774) --- src/include/config-h.in.cmake | 2 +- src/mgr/PyModuleRegistry.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake index 5ce4a2d4d16..c4788eb09d7 100644 --- a/src/include/config-h.in.cmake +++ b/src/include/config-h.in.cmake @@ -325,7 +325,7 @@ /* Define if endian type is little endian */ #cmakedefine CEPH_LITTLE_ENDIAN -#cmakedefine PYTHON_EXECUTABLE "@MGR_PYTHON_EXECUTABLE@" +#cmakedefine MGR_PYTHON_EXECUTABLE "@MGR_PYTHON_EXECUTABLE@" /* Define to 1 if you have the `getprogname' function. */ #cmakedefine HAVE_GETPROGNAME 1 diff --git a/src/mgr/PyModuleRegistry.cc b/src/mgr/PyModuleRegistry.cc index 84531ee8377..c84affde489 100644 --- a/src/mgr/PyModuleRegistry.cc +++ b/src/mgr/PyModuleRegistry.cc @@ -40,10 +40,10 @@ void PyModuleRegistry::init() // Set up global python interpreter #if PY_MAJOR_VERSION >= 3 #define WCHAR(s) L ## #s - Py_SetProgramName(const_cast(WCHAR(PYTHON_EXECUTABLE))); + Py_SetProgramName(const_cast(WCHAR(MGR_PYTHON_EXECUTABLE))); #undef WCHAR #else - Py_SetProgramName(const_cast(PYTHON_EXECUTABLE)); + Py_SetProgramName(const_cast(MGR_PYTHON_EXECUTABLE)); #endif // Add more modules if (g_conf->get_val("daemonize")) { -- 2.47.3