diff --git a/openmp/libompd/CMakeLists.txt b/openmp/libompd/CMakeLists.txt
--- a/openmp/libompd/CMakeLists.txt
+++ b/openmp/libompd/CMakeLists.txt
@@ -8,10 +8,19 @@
 #//===----------------------------------------------------------------------===//
 #
 
+set(LIBOMP_OMPD_GDB_SUPPORT FALSE CACHE BOOL
+        "Build gdb-plugin code that enables OMPD support in GDB.")
+
+find_package (Python3 COMPONENTS Interpreter Development)
+if (Python3_INCLUDE_DIRS AND Python3_LIBRARIES)
+    set(LIBOMP_OMPD_GDB_SUPPORT TRUE)
+endif()
+
+
 if(LIBOMP_OMPD_SUPPORT)
     set(OMPD_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/src/)
     add_subdirectory(src)
-    if(NOT DISABLE_OMPD_GDB_PLUGIN)
+    if(LIBOMP_OMPD_GDB_SUPPORT)
         add_subdirectory(gdb-plugin)
     endif()
 endif()
diff --git a/openmp/libompd/gdb-plugin/CMakeLists.txt b/openmp/libompd/gdb-plugin/CMakeLists.txt
--- a/openmp/libompd/gdb-plugin/CMakeLists.txt
+++ b/openmp/libompd/gdb-plugin/CMakeLists.txt
@@ -14,7 +14,6 @@
 )
 
 find_package (Python3 COMPONENTS Interpreter Development)
-find_package (PythonLibs REQUIRED)
 
 include_directories (${OMPD_INCLUDE_PATH})
 include_directories (${LIBOMP_INCLUDE_DIR})