summaryrefslogtreecommitdiff
path: root/usr/src/cmd/mdb/intel/amd64
diff options
context:
space:
mode:
authorDan McDonald <danmcd@mnx.io>2022-07-19 11:24:20 -0400
committerDan McDonald <danmcd@mnx.io>2022-07-19 11:24:20 -0400
commit56c7f1a1c7ca3aef7200fe9d148633070f0908dc (patch)
tree31807a50598560c84fe979887f3b14ecf8eb7d40 /usr/src/cmd/mdb/intel/amd64
parent81f8ded9e0469715043eb450f73e96578cb80240 (diff)
parent708bde8c8780e5414779e4d9e7a7648886a4700e (diff)
downloadillumos-joyent-OS-8397.tar.gz
[illumos-gate merge]OS-8397
commit 708bde8c8780e5414779e4d9e7a7648886a4700e 14786 remove packaging support for SPARC commit 70143b9fb6146f632b4b5d924e508df293b600df 14769 remove support for Python 2.x Conflicts: manifest usr/src/cmd/mdb/Makefile.module usr/src/tools/onbld/Checks/DbLookups.py
Diffstat (limited to 'usr/src/cmd/mdb/intel/amd64')
-rw-r--r--usr/src/cmd/mdb/intel/amd64/Makefile6
-rw-r--r--usr/src/cmd/mdb/intel/amd64/libpython/Makefile2
2 files changed, 6 insertions, 2 deletions
diff --git a/usr/src/cmd/mdb/intel/amd64/Makefile b/usr/src/cmd/mdb/intel/amd64/Makefile
index 39d3574f15..93bb4e2fdb 100644
--- a/usr/src/cmd/mdb/intel/amd64/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/Makefile
@@ -26,7 +26,11 @@
include ../../Makefile.common
-MODULES = $(COMMON_MODULES_PROC) $(COMMON_MODULES_KVM)
+MODULES = \
+ $(COMMON_MODULES_PROC) \
+ $(COMMON_MODULES_PROC_64BIT) \
+ $(COMMON_MODULES_KVM)
+
MODULES += disk_label uhci libsmbios
SUBDIRS = mdb mdb_ks kmdb libstandctf libstand .WAIT $(MODULES)
diff --git a/usr/src/cmd/mdb/intel/amd64/libpython/Makefile b/usr/src/cmd/mdb/intel/amd64/libpython/Makefile
index d78b5e0fc2..7937144a67 100644
--- a/usr/src/cmd/mdb/intel/amd64/libpython/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/libpython/Makefile
@@ -25,7 +25,7 @@
include $(SRC)/Makefile.master
-MODULE = libpython$(PYTHON_VERSION).so
+MODULE = libpython$(PYTHON3_VERSION).so
MDBTGT = proc
MODULE_NAME = libpython