diff options
Diffstat (limited to 'usr/src/cmd/mdb/intel')
| -rw-r--r-- | usr/src/cmd/mdb/intel/amd64/Makefile | 6 | ||||
| -rw-r--r-- | usr/src/cmd/mdb/intel/amd64/libpython/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/cmd/mdb/intel/ia32/libpython/Makefile | 61 |
3 files changed, 6 insertions, 63 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 diff --git a/usr/src/cmd/mdb/intel/ia32/libpython/Makefile b/usr/src/cmd/mdb/intel/ia32/libpython/Makefile deleted file mode 100644 index 9e19bf2e41..0000000000 --- a/usr/src/cmd/mdb/intel/ia32/libpython/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# Copyright (c) 2018, Joyent, Inc. - -include $(SRC)/Makefile.master - -MODULE = libpython$(PYTHON_VERSION).so -MDBTGT = proc -MODULE_NAME = libpython - -MODSRCS_DIR = ../../../common/modules/libpython - -MODSRCS = libpython.c - -include ../../../../Makefile.cmd -include ../../Makefile.ia32 -include ../../../Makefile.module - -%.o := CPPFLAGS += $(PYCPPFLAGS) -%.ln := CPPFLAGS += $(PYLNFLAGS) - -# -# Why these? Well, the pyconfig.h header hard-codes _FILE_OFFSET_BITS -# to 64, regardless of what we have set here. GCC quietens this complaint via -# use of -isystem, but neither lint nor smatch can do that. -# -LINTFLAGS += -erroff=E_MACRO_REDEFINED - -# not linted -SMATCH=off - -dmod/$(MODULE) := LDLIBS += -lproc - -%.o: $(MODSRCS_DIR)/%.c - $(COMPILE.c) $< - $(CTFCONVERT_O) - -%.ln: $(MODSRCS_DIR)/%.c - $(LINT.c) -c $< |