From d409ba67c694a3b66d6d2cc8b25d86a6dcf4215c Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@sudo.ws>
Date: Thu, 19 Jan 2023 13:22:31 -0700
Subject: [PATCH] Elminate the $OS variable, we can just use $host_os instead.

---
 configure    | 4 +---
 configure.ac | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 1416a834f..d58ffd87a 100755
--- a/configure
+++ b/configure
@@ -17454,11 +17454,9 @@ fi
 sudo_cv_prev_host="$host"
 
 if test -n "$host_os"; then
-    OS=`echo $host_os | sed 's/[0-9].*//'`
     OSREV=`echo $host_os | sed 's/^[^0-9\.]*\([0-9\.]*\).*$/\1/'`
     OSMAJOR=`echo $OSREV | sed 's/\..*$//'`
 else
-    OS="unknown"
     OSREV=0
     OSMAJOR=0
 fi
@@ -31543,7 +31541,7 @@ fi
 
 fi
 
-case "$OS" in
+case "$host_os" in
     netbsd*)
 	;;
     *)
diff --git a/configure.ac b/configure.ac
index 8d6c3bcbc..1a32c3f08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1796,11 +1796,9 @@ dnl
 dnl We want to be able to differentiate between different rev's
 dnl
 if test -n "$host_os"; then
-    OS=`echo $host_os | sed 's/[[0-9]].*//'`
     OSREV=`echo $host_os | sed 's/^[[^0-9\.]]*\([[0-9\.]]*\).*$/\1/'`
     OSMAJOR=`echo $OSREV | sed 's/\..*$//'`
 else
-    OS="unknown"
     OSREV=0
     OSMAJOR=0
 fi
@@ -4059,7 +4057,7 @@ dnl We want to use DT_RUNPATH in preference to DT_RPATH in ELF binaries.
 dnl Otherwise, LD_LIBRARY_PATH does not work when running the tests.
 dnl We don't do this on NetBSD where RPATH already supports LD_LIBRARY_PATH.
 dnl
-case "$OS" in
+case "$host_os" in
     netbsd*)
 	;;
     *)