Mercurial > illumos > illumos-gate

changeset 2878:a22f8f1c12b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6473807 eversholt could use some mdb support (fix ELF runtime)
author gavinm
date Fri, 06 Oct 2006 18:18:01 -0700
parents 8bbef5f80188
children 4b7701498cac
files usr/src/cmd/fm/modules/Makefile.plugin usr/src/cmd/fm/modules/i86pc/sfx4500-disk/Makefile
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/fm/modules/Makefile.plugin	Fri Oct 06 15:28:14 2006 -0700
+++ b/usr/src/cmd/fm/modules/Makefile.plugin	Fri Oct 06 18:18:01 2006 -0700
@@ -75,10 +75,12 @@
 CFLAGS += -G $(XREGSFLAG) 
 
 CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT
-$(PROG) := LDFLAGS += $(ZTEXT) $(ZCOMBRELOC) $(ZDEFS) $(ZIGNORE) -M$(APIMAP) -M$(FMRIMAP)
+LDFLAGS += $(ZTEXT) $(ZCOMBRELOC) $(ZIGNORE)
+
+$(PROG) := LDFLAGS += $(ZDEFS) -M$(APIMAP) -M$(FMRIMAP)
 $(PROG) := LDLIBS += -lnvpair -lc
 
-$(DMODPROG) := LDFLAGS += $(ZTEXT) $(ZCOMBRELOC)
+$(DMOD_PROG) := LDFLAGS += $(ZNODEFS)
 
 all: $(PROG) $(DMODPROG)
 
--- a/usr/src/cmd/fm/modules/i86pc/sfx4500-disk/Makefile	Fri Oct 06 15:28:14 2006 -0700
+++ b/usr/src/cmd/fm/modules/i86pc/sfx4500-disk/Makefile	Fri Oct 06 18:18:01 2006 -0700
@@ -34,5 +34,5 @@
 include ../../Makefile.plugin
 LINTFLAGS += -I. -I$(SRC)/lib/fm/topo/modules/i86pc/sata -L$(ROOT)/usr/lib/fm
 CFLAGS += -I. -I$(SRC)/lib/fm/topo/modules/i86pc/sata
-LDLIBS += -lsysevent -lnvpair -lsmbios -ldl -lcfgadm -ltopo -luutil
+LDLIBS += -lsysevent -lnvpair -lsmbios -lcfgadm -ltopo -luutil
 LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm