Mercurial > unleashed
changeset 20649:ae87453e2b30
lib/fm/topo/module: build 64-bit
turns out there is only one set of topo plugins, ie. they were never
multiarch, even though libtopo and the related libs are. so make the
plugins 64-bit.
| author | Lauri Tirkkonen <lotheac@iki.fi> |
|---|---|
| date | Thu, 07 Nov 2019 17:42:09 +0200 |
| parents | 396f603a4ffc |
| children | 5241ce825dd7 |
| files | usr/src/lib/fm/topo/modules/Makefile.plugin usr/src/lib/fm/topo/modules/common/ses/Makefile |
| diffstat | 2 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/lib/fm/topo/modules/Makefile.plugin Thu Nov 07 17:39:51 2019 +0200 +++ b/usr/src/lib/fm/topo/modules/Makefile.plugin Thu Nov 07 17:42:09 2019 +0200 @@ -30,6 +30,7 @@ include ../../../../Makefile.lib include ../../../../../Makefile.lib +include ../../../../../Makefile.lib.64 # # Set PROG and OBJS based on the values of MODULE and SRCS. We expect that @@ -62,14 +63,14 @@ MAPFILES = # use APIMAP instead CSTD = $(CSTD_GNU99) -CFLAGS += $(CTF_FLAGS) $(CC_PICFLAGS) -CFLAGS += $(GSHARED) $(XREGSFLAG) +CFLAGS64 += $(CTF_FLAGS) $(CC_PICFLAGS) +CFLAGS64 += $(GSHARED) $(XREGSFLAG) CPPFLAGS += -I. CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS LDFLAGS += $(ZIGNORE) -Wl,-M$(APIMAP) -LDLIBS += -L$(ROOT)/usr/lib/fm/$(MACH32) -ltopo -lnvpair -lc -DYNFLAGS += -R/usr/lib/fm/$(MACH32) +LDLIBS += -L$(ROOT)/usr/lib/fm -ltopo -lnvpair -lc +DYNFLAGS += -R/usr/lib/fm all: $(PROG)
--- a/usr/src/lib/fm/topo/modules/common/ses/Makefile Thu Nov 07 17:39:51 2019 +0200 +++ b/usr/src/lib/fm/topo/modules/common/ses/Makefile Thu Nov 07 17:42:09 2019 +0200 @@ -34,7 +34,7 @@ CPPFLAGS += -I../disk -LDLIBS += -L$(ROOT)/usr/lib/scsi/$(MACH32) -R/usr/lib/scsi/$(MACH32) -lses +LDLIBS += -L$(ROOT)/usr/lib/scsi -R/usr/lib/scsi -lses LDLIBS += -ldevinfo -ldevid -ldiskstatus -lcontract -lsysevent -ldiskmgt CLOBBERFILES += disk_common.ln