summaryrefslogtreecommitdiff
path: root/usr/src/cmd/mdb
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/cmd/mdb')
-rw-r--r--usr/src/cmd/mdb/Makefile.module11
-rw-r--r--usr/src/cmd/mdb/intel/amd64/libpython/Makefile5
-rw-r--r--usr/src/cmd/mdb/intel/ia32/libpython/Makefile4
-rw-r--r--usr/src/cmd/mdb/sparc/v7/libpython/Makefile4
-rw-r--r--usr/src/cmd/mdb/sparc/v9/libpython/Makefile4
5 files changed, 26 insertions, 2 deletions
diff --git a/usr/src/cmd/mdb/Makefile.module b/usr/src/cmd/mdb/Makefile.module
index 47a3e15fe2..ed23c5c9dd 100644
--- a/usr/src/cmd/mdb/Makefile.module
+++ b/usr/src/cmd/mdb/Makefile.module
@@ -101,6 +101,15 @@ LINTFILES_proc = $(LINTOBJS)
LINTFILES_raw = $(LINTOBJS)
LINTFILES = $(LINTFILES_$(MDBTGT))
+#
+# Python specific flags. To try and make life easier for folks how are
+# building with an LFS python, we attempt to use -isystem when it's
+# available.
+#
+PYCPPFLAGS = -_gcc=-isystem -_gcc=$(ADJUNCT_PROTO)/usr/include/python$(PYTHON_VERSION)
+PYCPPFLAGS += -_cc=-I$(ADJUNCT_PROTO)/usr/include/python$(PYTHON_VERSION)
+PYLNFLAGS = -I$(ADJUNCT_PROTO)/usr/include/python$(PYTHON_VERSION)
+
kvm_TGTFLAGS = -D_KERNEL
proc_TGTFLAGS = -D_USER
@@ -108,7 +117,7 @@ C99MODE = $(C99_ENABLE)
CFLAGS += $(CCVERBOSE)
CFLAGS64 += $(CCVERBOSE)
-CPPFLAGS += $($(MDBTGT)_TGTFLAGS) -I../../../common -I/usr/include/python$(PYTHON_VERSION)
+CPPFLAGS += $($(MDBTGT)_TGTFLAGS) -I../../../common
LDFLAGS += $(ZTEXT)
LDFLAGS64 += $(ZTEXT)
ASFLAGS += -P
diff --git a/usr/src/cmd/mdb/intel/amd64/libpython/Makefile b/usr/src/cmd/mdb/intel/amd64/libpython/Makefile
index cd4f4c669f..f454b29658 100644
--- a/usr/src/cmd/mdb/intel/amd64/libpython/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/libpython/Makefile
@@ -38,6 +38,11 @@ include ../../../../Makefile.cmd.64
include ../../Makefile.amd64
include ../../../Makefile.module
+%.o := CPPFLAGS += $(PYCPPFLAGS)
+%.ln := CPPFLAGS += $(PYLNFLAGS)
+LINTFLAGS += -erroff=E_MACRO_REDEFINED
+
+
dmod/$(MODULE) := LDLIBS += -lproc
%.o: $(MODSRCS_DIR)/%.c
diff --git a/usr/src/cmd/mdb/intel/ia32/libpython/Makefile b/usr/src/cmd/mdb/intel/ia32/libpython/Makefile
index 2abfe7acb6..4ad419c859 100644
--- a/usr/src/cmd/mdb/intel/ia32/libpython/Makefile
+++ b/usr/src/cmd/mdb/intel/ia32/libpython/Makefile
@@ -37,7 +37,9 @@ include ../../../../Makefile.cmd
include ../../Makefile.ia32
include ../../../Makefile.module
-%.o := CPPFLAGS += -_gcc=-isystem -_gcc=$(ADJUNCT_PROTO)/usr/include
+%.o := CPPFLAGS += $(PYCPPFLAGS)
+%.ln := CPPFLAGS += $(PYLNFLAGS)
+LINTFLAGS += -erroff=E_MACRO_REDEFINED
dmod/$(MODULE) := LDLIBS += -lproc
diff --git a/usr/src/cmd/mdb/sparc/v7/libpython/Makefile b/usr/src/cmd/mdb/sparc/v7/libpython/Makefile
index f0c2120e4f..06c128a1f4 100644
--- a/usr/src/cmd/mdb/sparc/v7/libpython/Makefile
+++ b/usr/src/cmd/mdb/sparc/v7/libpython/Makefile
@@ -37,6 +37,10 @@ include ../../../../Makefile.cmd
include ../../Makefile.sparcv7
include ../../../Makefile.module
+%.o := CPPFLAGS += $(PYCPPFLAGS)
+%.ln := CPPFLAGS += $(PYLNFLAGS)
+LINTFLAGS += -erroff=E_MACRO_REDEFINED
+
dmod/$(MODULE) := LDLIBS += -lproc
%.o: $(MODSRCS_DIR)/%.c
diff --git a/usr/src/cmd/mdb/sparc/v9/libpython/Makefile b/usr/src/cmd/mdb/sparc/v9/libpython/Makefile
index cb3d7a78b8..79f47dd624 100644
--- a/usr/src/cmd/mdb/sparc/v9/libpython/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/libpython/Makefile
@@ -38,6 +38,10 @@ include ../../../../Makefile.cmd.64
include ../../Makefile.sparcv9
include ../../../Makefile.module
+%.o := CPPFLAGS += $(PYCPPFLAGS)
+%.ln := CPPFLAGS += $(PYLNFLAGS)
+LINTFLAGS += -erroff=E_MACRO_REDEFINED
+
dmod/$(MODULE) := LDLIBS += -lproc
%.o: $(MODSRCS_DIR)/%.c