diff options
author | Keith M Wesolowski <wesolows@foobazco.org> | 2013-08-21 23:54:45 +0000 |
---|---|---|
committer | Keith M Wesolowski <wesolows@foobazco.org> | 2013-08-21 23:54:45 +0000 |
commit | 84a6527d59b307f3925d3dbac3728fd0d1db4706 (patch) | |
tree | 0f87ef159a57043733b2ad0f861e14d22d635942 /usr/src/cmd/mdb/intel | |
parent | 7d7a5b1f6447ad858fd291d2b95da27e7c690325 (diff) | |
parent | 2a12f85ad140e332791b4bad1208a734c3f26bf3 (diff) | |
download | illumos-joyent-release-20130822.tar.gz |
[illumos-gate merge]20130822release-20130822
commit 2a12f85ad140e332791b4bad1208a734c3f26bf3
3946 ::gcore
commit 840b2722e5294ae44aa3af6189002f521d7c50e0
3915 Add adjuncts support to the build (fix lint)
commit afffa6e9b45cbe9b33943e26568d8ac69b899252
4062 libscf: memory leaks in scf_simple_app_props_get()
commit 2fbdf8dbf01ec1c85fcd3827cdf9e9f5f46c4c8a
4061 libzfs: memory leak in iter_dependents_cb()
commit 713d6c208802cfbb806329ec0d154b641b80c355
4047 panic from dbuf_free_range() from dmu_free_object() while doing zfs receive
Diffstat (limited to 'usr/src/cmd/mdb/intel')
-rw-r--r-- | usr/src/cmd/mdb/intel/amd64/genunix/Makefile | 6 | ||||
-rw-r--r-- | usr/src/cmd/mdb/intel/ia32/genunix/Makefile | 6 | ||||
-rw-r--r-- | usr/src/cmd/mdb/intel/ia32/libpython2.6/Makefile | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/usr/src/cmd/mdb/intel/amd64/genunix/Makefile b/usr/src/cmd/mdb/intel/amd64/genunix/Makefile index fb372b267b..8a284bb2d0 100644 --- a/usr/src/cmd/mdb/intel/amd64/genunix/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/genunix/Makefile @@ -24,6 +24,8 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright (c) 2013 by Delphix. All rights reserved. +# MODULE = genunix.so MDBTGT = kvm @@ -50,7 +52,7 @@ include ../../../../Makefile.cmd.64 include ../../Makefile.amd64 include ../../../Makefile.module -dmod/$(MODULE) := LDLIBS += -lm +dmod/$(MODULE) := LDLIBS += -lm -lproc # # We are not actually hardwiring some dependency on i86pc, we just need to @@ -72,3 +74,5 @@ CERRWARN += -_gcc=-Wno-unused-label CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-type-limits + +LINTFLAGS64 += -erroff=E_EMPTY_TRANSLATION_UNIT diff --git a/usr/src/cmd/mdb/intel/ia32/genunix/Makefile b/usr/src/cmd/mdb/intel/ia32/genunix/Makefile index e5efcd19ac..354dc8e6b2 100644 --- a/usr/src/cmd/mdb/intel/ia32/genunix/Makefile +++ b/usr/src/cmd/mdb/intel/ia32/genunix/Makefile @@ -22,6 +22,8 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright (c) 2013 by Delphix. All rights reserved. +# MODULE = genunix.so MDBTGT = kvm @@ -47,7 +49,7 @@ include ../../../../Makefile.cmd include ../../Makefile.ia32 include ../../../Makefile.module -dmod/$(MODULE) := LDLIBS += -lm +dmod/$(MODULE) := LDLIBS += -lm -lproc # # We are not actually hardwiring some dependency on i86pc, we just need to @@ -69,3 +71,5 @@ CERRWARN += -_gcc=-Wno-unused-label CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-type-limits + +LINTFLAGS += -erroff=E_EMPTY_TRANSLATION_UNIT diff --git a/usr/src/cmd/mdb/intel/ia32/libpython2.6/Makefile b/usr/src/cmd/mdb/intel/ia32/libpython2.6/Makefile index ab57dbd02a..1928c56cd3 100644 --- a/usr/src/cmd/mdb/intel/ia32/libpython2.6/Makefile +++ b/usr/src/cmd/mdb/intel/ia32/libpython2.6/Makefile @@ -34,7 +34,7 @@ include ../../../../Makefile.cmd include ../../Makefile.ia32 include ../../../Makefile.module -$(__GNUC)CPPFLAGS += -isystem $(ADJUNCT_PROTO)/usr/include +%.o := CPPFLAGS += -_gcc=-isystem -_gcc=$(ADJUNCT_PROTO)/usr/include dmod/$(MODULE) := LDLIBS += -lproc |