5 files changed, 3 insertions, 56 deletions
diff --git a/usr/src/cmd/mdb/intel/amd64/Makefile b/usr/src/cmd/mdb/intel/amd64/Makefile
index 39d3574f15..6ddc6b59d5 100644
--- a/usr/src/cmd/mdb/intel/amd64/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/Makefile
@@ -27,7 +27,7 @@
 include ../../Makefile.common
 
 MODULES = $(COMMON_MODULES_PROC) $(COMMON_MODULES_KVM)
-MODULES += disk_label uhci libsmbios
+MODULES += disk_label uhci
 
 SUBDIRS = mdb mdb_ks kmdb libstandctf libstand .WAIT $(MODULES)
 
diff --git a/usr/src/cmd/mdb/intel/amd64/libsmbios/Makefile b/usr/src/cmd/mdb/intel/amd64/libsmbios/Makefile
deleted file mode 100644
index a04ca7df17..0000000000
--- a/usr/src/cmd/mdb/intel/amd64/libsmbios/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms of version
-# 1.0 of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source.  A copy of the CDDL is also available via the Internet at
-# http://www.illumos.org/license/CDDL.
-#
-
-#
-# Copyright 2020 Oxide Computer Company
-#
-
-MODULE = libsmbios.so
-MDBTGT = proc
-
-MODSRCS = smbios.c
-
-include ../../../../Makefile.cmd
-include ../../../../Makefile.cmd.64
-include ../../Makefile.amd64
-include ../../../Makefile.module
-
-MODSRCS_DIR = ../../modules/smbios
-LDLIBS += -lsmbios
diff --git a/usr/src/cmd/mdb/intel/ia32/Makefile b/usr/src/cmd/mdb/intel/ia32/Makefile
index 9d8f9efe87..cb544a52d2 100644
--- a/usr/src/cmd/mdb/intel/ia32/Makefile
+++ b/usr/src/cmd/mdb/intel/ia32/Makefile
@@ -28,7 +28,7 @@
 include ../../Makefile.common
 
 MODULES = $(COMMON_MODULES_PROC) $(COMMON_MODULES_PROC_32BIT)
-MODULES += disk_label libsmbios
+MODULES += disk_label
 
 SUBDIRS = mdb .WAIT $(MODULES)
 
diff --git a/usr/src/cmd/mdb/intel/ia32/libsmbios/Makefile b/usr/src/cmd/mdb/intel/ia32/libsmbios/Makefile
deleted file mode 100644
index 14491786c2..0000000000
--- a/usr/src/cmd/mdb/intel/ia32/libsmbios/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms of version
-# 1.0 of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source.  A copy of the CDDL is also available via the Internet at
-# http://www.illumos.org/license/CDDL.
-#
-
-#
-# Copyright 2020 Oxide Computer Company
-#
-
-MODULE = libsmbios.so
-MDBTGT = proc
-
-MODSRCS = smbios.c
-
-include ../../../../Makefile.cmd
-include ../../Makefile.ia32
-include ../../../Makefile.module
-
-MODSRCS_DIR = ../../modules/smbios
-LDLIBS += -lsmbios
diff --git a/usr/src/cmd/mdb/intel/modules/smbios/smbios.c b/usr/src/cmd/mdb/intel/modules/smbios/smbios.c
index 1b692d45b1..429a5fba0e 100644
--- a/usr/src/cmd/mdb/intel/modules/smbios/smbios.c
+++ b/usr/src/cmd/mdb/intel/modules/smbios/smbios.c
@@ -28,7 +28,7 @@
  * _KERNEL. Therefore we have to manually declare an extern delaration for
  * strerror().
  */
-extern char *strerror(int);
+extern const char *strerror(int);
 
 /*
  * Take an existing smbios_hdl_t from a dump and slurp out its memory so we can