diff options
| author | rie <none@none> | 2008-01-31 15:59:01 -0800 |
|---|---|---|
| committer | rie <none@none> | 2008-01-31 15:59:01 -0800 |
| commit | aaf1276246316144c23f1355fe2706b9d3fcbe2d (patch) | |
| tree | 469b7396fd163269b33230edbde954abed492630 /usr/src/cmd/picl | |
| parent | 5b6e0c463149a26dd0aeb4c1f70611c97161ff32 (diff) | |
| download | illumos-joyent-aaf1276246316144c23f1355fe2706b9d3fcbe2d.tar.gz | |
6657275 fixes for 4947191 cause problems for sun4v/PICL
6657340 tst.helper.d on x86 was broken by 4947191
Diffstat (limited to 'usr/src/cmd/picl')
| -rw-r--r-- | usr/src/cmd/picl/plugins/Makefile.com | 8 | ||||
| -rw-r--r-- | usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/usr/src/cmd/picl/plugins/Makefile.com b/usr/src/cmd/picl/plugins/Makefile.com index 5e5dda5d6c..f692976b7e 100644 --- a/usr/src/cmd/picl/plugins/Makefile.com +++ b/usr/src/cmd/picl/plugins/Makefile.com @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -32,6 +32,12 @@ CPPFLAGS += -I$(SRC)/lib/libpicl -I$(SRC)/lib/libpicltree CPPFLAGS += -I$(SRC)/cmd/picl/plugins/inc CFLAGS += $(CCVERBOSE) +# Some picl plugins have dependencies to which they make no reference. These +# dependencies are expected to be loaded so that their .init's fire and thus +# populate the picl database before the dependency itself adds to the database. +# Turn off lazy loading so that all plugin dependencies are loaded. +DYNFLAGS += $(ZNOLAZYLOAD) + ROOTLIBDIR := DIRMODE= 0755 ROOTLIBDIR := OWNER= root ROOTLIBDIR := GROUP= sys diff --git a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com index 4d286b7475..bff1d92236 100644 --- a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com +++ b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -55,6 +55,7 @@ POFILE= picld_pluginutil.po CPPFLAGS += -I.. -I$(SRC)/lib/libpicl -I$(SRC)/lib/libpicltree CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT +DYNFLAGS += $(ZNOLAZYLOAD) LDLIBS += -L$(SRC)/lib/libpicltree/$(MACH) LDLIBS += -lc -lpicltree |