From 1449e0627ab74b680588e20a0fbe950975d8f626 Mon Sep 17 00:00:00 2001 From: Lauri Tirkkonen Date: Thu, 7 Nov 2019 17:42:09 +0200 Subject: [PATCH] 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. --- usr/src/lib/fm/topo/modules/Makefile.plugin | 9 +++++---- usr/src/lib/fm/topo/modules/common/ses/Makefile | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/usr/src/lib/fm/topo/modules/Makefile.plugin b/usr/src/lib/fm/topo/modules/Makefile.plugin index 60fe2fb87d..a1428bfe77 100644 --- a/usr/src/lib/fm/topo/modules/Makefile.plugin +++ b/usr/src/lib/fm/topo/modules/Makefile.plugin @@ -30,6 +30,7 @@ MODCLASS = plugins 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 @@ APIMAP = ../../../libtopo/common/topo_mod.map 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) diff --git a/usr/src/lib/fm/topo/modules/common/ses/Makefile b/usr/src/lib/fm/topo/modules/common/ses/Makefile index 916866b1e8..045f55ca39 100644 --- a/usr/src/lib/fm/topo/modules/common/ses/Makefile +++ b/usr/src/lib/fm/topo/modules/common/ses/Makefile @@ -34,7 +34,7 @@ include ../../Makefile.plugin 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 -- 2.11.4.GIT