From af28f7a03d3b31e564c3eb1cbd374272cbbb5de8 Mon Sep 17 00:00:00 2001
From: Lauri Tirkkonen <lotheac@iki.fi>
Date: Mon, 4 Nov 2019 13:00:57 +0200
Subject: [PATCH] fm: use LDFLAGS, not LDFLAGS64

LDFLAGS64 does not seem to be used; binaries end up not having rpath.
---
 usr/src/cmd/fm/fmadm/Makefile.com      | 2 +-
 usr/src/cmd/fm/fmd/Makefile.fmd        | 4 ++--
 usr/src/cmd/fm/fmdump/Makefile.com     | 2 +-
 usr/src/cmd/fm/fminject/Makefile.com   | 2 +-
 usr/src/cmd/fm/fmtopo/Makefile.com     | 2 +-
 usr/src/cmd/fm/modules/Makefile.plugin | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr/src/cmd/fm/fmadm/Makefile.com b/usr/src/cmd/fm/fmadm/Makefile.com
index 2438aece6d..25844f8d77 100644
--- a/usr/src/cmd/fm/fmadm/Makefile.com
+++ b/usr/src/cmd/fm/fmadm/Makefile.com
@@ -43,7 +43,7 @@ CPPFLAGS += -I. -I../common
 CFLAGS64 += $(CTF_FLAGS)
 LDLIBS64 += -L$(ROOT)/usr/lib/fm -lfmd_adm -lfmd_msg
 LDLIBS64 += -lnvpair -ltopo
-LDFLAGS64 += -R/usr/lib/fm
+LDFLAGS += -R/usr/lib/fm
 
 .NO_PARALLEL:
 .PARALLEL: $(OBJS)
diff --git a/usr/src/cmd/fm/fmd/Makefile.fmd b/usr/src/cmd/fm/fmd/Makefile.fmd
index fedadfde74..5ffb454bd9 100644
--- a/usr/src/cmd/fm/fmd/Makefile.fmd
+++ b/usr/src/cmd/fm/fmd/Makefile.fmd
@@ -124,12 +124,12 @@ CERRWARN += -Wno-clobbered
 # not linted
 SMATCH=off
 
-$(PROG) := LDFLAGS64 += -R/usr/lib/fm
+$(PROG) := LDFLAGS += -R/usr/lib/fm
 $(PROG) := LDLIBS64 += -L$(ROOTLIB64)/fm -ltopo -ldiagcode -lsysevent -lsmbios \
 		-luuid -lnvpair -lexacct -lumem -ldevinfo -lfmd_msg
 
 $(DMOD) := CFLAGS64 += $(CC_PICFLAGS) $(GSHARED) $(XREGSFLAG)
-$(DMOD) := LDFLAGS64 += $(ZTEXT) $(ZDEFS) $(MAPFILE-DMOD:%=-Wl,-M%)
+$(DMOD) := LDFLAGS += $(ZTEXT) $(ZDEFS) $(MAPFILE-DMOD:%=-Wl,-M%)
 
 #
 # rpcgen(1) produces code that wants to be in the foreground if we're compiled
diff --git a/usr/src/cmd/fm/fmdump/Makefile.com b/usr/src/cmd/fm/fmdump/Makefile.com
index 5a8c9e6f7a..4308beb238 100644
--- a/usr/src/cmd/fm/fmdump/Makefile.com
+++ b/usr/src/cmd/fm/fmdump/Makefile.com
@@ -35,7 +35,7 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
 CPPFLAGS += -I. -I../common -I../../include
 CFLAGS64 += $(CTF_FLAGS)
 LDLIBS64 += -L$(ROOT)/usr/lib/fm -lfmd_log -lnvpair -ltopo -lfmd_msg
-LDFLAGS64 += -R/usr/lib/fm
+LDFLAGS += -R/usr/lib/fm
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-uninitialized
 
diff --git a/usr/src/cmd/fm/fminject/Makefile.com b/usr/src/cmd/fm/fminject/Makefile.com
index e510092fcb..1ed6ae3d96 100644
--- a/usr/src/cmd/fm/fminject/Makefile.com
+++ b/usr/src/cmd/fm/fminject/Makefile.com
@@ -54,7 +54,7 @@ CERRWARN += -Wno-type-limits
 CERRWARN += -Wno-unused-label
 CERRWARN += -Wno-unused-variable
 LDLIBS64 += -L$(ROOT)/usr/lib/fm -lfmd_log -lsysevent -lnvpair -lumem
-LDFLAGS64 += -R/usr/lib/fm
+LDFLAGS += -R/usr/lib/fm
 STRIPFLAG =
 
 LFLAGS += -t
diff --git a/usr/src/cmd/fm/fmtopo/Makefile.com b/usr/src/cmd/fm/fmtopo/Makefile.com
index 96a40acfbc..15fef739ec 100644
--- a/usr/src/cmd/fm/fmtopo/Makefile.com
+++ b/usr/src/cmd/fm/fmtopo/Makefile.com
@@ -41,7 +41,7 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
 CPPFLAGS += -I. -I../common
 CFLAGS64 += $(CTF_FLAGS)
 LDLIBS64 += -L$(ROOT)/usr/lib/fm -ltopo -lnvpair
-LDFLAGS64 += -R/usr/lib/fm
+LDFLAGS += -R/usr/lib/fm
 
 # not linted
 SMATCH=off
diff --git a/usr/src/cmd/fm/modules/Makefile.plugin b/usr/src/cmd/fm/modules/Makefile.plugin
index 2874a34a99..011e98ba58 100644
--- a/usr/src/cmd/fm/modules/Makefile.plugin
+++ b/usr/src/cmd/fm/modules/Makefile.plugin
@@ -78,12 +78,12 @@ CFLAGS64 += $(CTF_FLAGS) $(CC_PICFLAGS)
 CFLAGS64 += $(GSHARED) $(XREGSFLAG) 
 
 CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS
-LDFLAGS64 += $(ZDEFS) $(ZTEXT) $(ZIGNORE)
+LDFLAGS += $(ZDEFS) $(ZTEXT) $(ZIGNORE)
 
 MAPFILE-DMOD = $(SRC)/cmd/mdb/common/modules/conf/mapfile-extern
 
 
-$(PROG) := LDFLAGS64 += -Wl,-M$(APIMAP) -Wl,-M$(FMRIMAP)
+$(PROG) := LDFLAGS += -Wl,-M$(APIMAP) -Wl,-M$(FMRIMAP)
 $(PROG) := LDLIBS64 += -lnvpair -lc
 
 all: $(PROG) $(DMODPROG)
-- 
2.11.4.GIT