diff --git a/core/gcc/build b/core/gcc/build
index 643bec8e..cf200f21 100755
--- a/core/gcc/build
+++ b/core/gcc/build
@@ -15,8 +15,7 @@ mkdir -p gcc-build
 cd gcc-build
 
 # Grab the system's GCC version.
-IFS=. read -r gcc_version _ 2>/dev/null \
-    < "$KISS_ROOT/var/db/kiss/installed/gcc/version" || gcc_version=null
+gcc_version=$(gcc -dumpversion) || gcc_version=null
 
 # Skip the bootstrap process if we are able.
 case $2 in "$gcc_version"*)
diff --git a/extra/cmake/build b/extra/cmake/build
index 5d908094..efa22fb2 100755
--- a/extra/cmake/build
+++ b/extra/cmake/build
@@ -2,7 +2,7 @@
 
 patch -p1 < cmake-no-execinfo.patch
 
-if kiss l cmake; then
+if command -v cmake >/dev/null; then
     cmake -B build \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/mesa/build b/extra/mesa/build
index 20bc6e7b..ea4c5467 100755
--- a/extra/mesa/build
+++ b/extra/mesa/build
@@ -34,7 +34,7 @@ mv -f _ meson.build
 # To prevent the need for users to fork the mesa package to add
 # libglvnd support, the below code checks for its availability
 # and enables it if present. ie: install glvnd, rebuild mesa.
-! kiss l libglvnd >/dev/null 2>&1 || glvnd_enabled=true
+pkg-config --exists libglvnd || glvnd_enabled=false
 
 meson \
     --prefix=/usr \
@@ -48,7 +48,7 @@ meson \
     -Degl=enabled \
     -Dvalgrind=false \
     -Dzstd=false \
-    -Dglvnd="${glvnd_enabled:-false}" \
+    -Dglvnd="${glvnd_enabled:-true}" \
     . output
 
 ninja -C output