From 102f8eadf7c32afe67202fddf8475cb53935d0c2 Mon Sep 17 00:00:00 2001
From: Oyintare Ebelo <75279482+TareHimself@users.noreply.github.com>
Date: Tue, 23 Dec 2025 19:04:04 -0800
Subject: [PATCH 1/2] better python resolution

---
 tools/cmake/Utils.cmake | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/tools/cmake/Utils.cmake b/tools/cmake/Utils.cmake
index 77918ebbf2e..a515a854008 100644
--- a/tools/cmake/Utils.cmake
+++ b/tools/cmake/Utils.cmake
@@ -69,30 +69,10 @@ function(target_link_options_gc_sections target_name)
   endif()
 endfunction()
 
-# Sets the value of the PYTHON_EXECUTABLE variable to 'python' if in an active
-# (non-base) conda environment, and 'python3' otherwise. This maintains
-# backwards compatibility for non-conda users and avoids conda users needing to
-# explicitly set PYTHON_EXECUTABLE=python.
 function(resolve_python_executable)
-  # Counter-intuitively, CONDA_DEFAULT_ENV contains the name of the active
-  # environment.
-  if(DEFINED ENV{CONDA_DEFAULT_ENV} AND NOT $ENV{CONDA_DEFAULT_ENV} STREQUAL
-                                        "base"
-  )
-    set(PYTHON_EXECUTABLE
-        python
-        PARENT_SCOPE
-    )
-  elseif(DEFINED ENV{VIRTUAL_ENV})
-    set(PYTHON_EXECUTABLE
-        $ENV{VIRTUAL_ENV}/bin/python3
-        PARENT_SCOPE
-    )
-  else()
-    set(PYTHON_EXECUTABLE
-        python3
-        PARENT_SCOPE
-    )
+  if(NOT PYTHON_EXECUTABLE)
+    find_package(Python3 REQUIRED COMPONENTS Interpreter)
+    set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} PARENT_SCOPE)
   endif()
 endfunction()
 

From f5c06aad7907448ecef67b047736008c867fe037 Mon Sep 17 00:00:00 2001
From: Oyintare Ebelo <75279482+TareHimself@users.noreply.github.com>
Date: Tue, 23 Dec 2025 21:15:15 -0800
Subject: [PATCH 2/2] lint

---
 tools/cmake/Utils.cmake | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/cmake/Utils.cmake b/tools/cmake/Utils.cmake
index a515a854008..cb3b85e19ef 100644
--- a/tools/cmake/Utils.cmake
+++ b/tools/cmake/Utils.cmake
@@ -72,7 +72,10 @@ endfunction()
 function(resolve_python_executable)
   if(NOT PYTHON_EXECUTABLE)
     find_package(Python3 REQUIRED COMPONENTS Interpreter)
-    set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} PARENT_SCOPE)
+    set(PYTHON_EXECUTABLE
+      ${Python3_EXECUTABLE}
+      PARENT_SCOPE
+    )
   endif()
 endfunction()