Mercurial > unleashed
changeset 20644:c220c8b6a4e2
fm: use LDFLAGS, not LDFLAGS64
LDFLAGS64 does not seem to be used; binaries end up not having rpath.
| author | Lauri Tirkkonen <lotheac@iki.fi> |
|---|---|
| date | Mon, 04 Nov 2019 13:00:57 +0200 |
| parents | 1b9c371b1b41 |
| children | 8c00cd328527 |
| files | usr/src/cmd/fm/fmadm/Makefile.com usr/src/cmd/fm/fmd/Makefile.fmd usr/src/cmd/fm/fmdump/Makefile.com usr/src/cmd/fm/fminject/Makefile.com usr/src/cmd/fm/fmtopo/Makefile.com usr/src/cmd/fm/modules/Makefile.plugin |
| diffstat | 6 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/fm/fmadm/Makefile.com Mon Nov 04 13:00:30 2019 +0200 +++ b/usr/src/cmd/fm/fmadm/Makefile.com Mon Nov 04 13:00:57 2019 +0200 @@ -43,7 +43,7 @@ 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)
--- a/usr/src/cmd/fm/fmd/Makefile.fmd Mon Nov 04 13:00:30 2019 +0200 +++ b/usr/src/cmd/fm/fmd/Makefile.fmd Mon Nov 04 13:00:57 2019 +0200 @@ -124,12 +124,12 @@ # 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
--- a/usr/src/cmd/fm/fmdump/Makefile.com Mon Nov 04 13:00:30 2019 +0200 +++ b/usr/src/cmd/fm/fmdump/Makefile.com Mon Nov 04 13:00:57 2019 +0200 @@ -35,7 +35,7 @@ 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
--- a/usr/src/cmd/fm/fminject/Makefile.com Mon Nov 04 13:00:30 2019 +0200 +++ b/usr/src/cmd/fm/fminject/Makefile.com Mon Nov 04 13:00:57 2019 +0200 @@ -54,7 +54,7 @@ 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
--- a/usr/src/cmd/fm/fmtopo/Makefile.com Mon Nov 04 13:00:30 2019 +0200 +++ b/usr/src/cmd/fm/fmtopo/Makefile.com Mon Nov 04 13:00:57 2019 +0200 @@ -41,7 +41,7 @@ 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
--- a/usr/src/cmd/fm/modules/Makefile.plugin Mon Nov 04 13:00:30 2019 +0200 +++ b/usr/src/cmd/fm/modules/Makefile.plugin Mon Nov 04 13:00:57 2019 +0200 @@ -78,12 +78,12 @@ 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)