diff options
| author | Robert Mustacchi <rm@fingolfin.org> | 2020-10-30 11:38:51 -0700 |
|---|---|---|
| committer | Robert Mustacchi <rm@fingolfin.org> | 2020-11-04 07:32:14 -0800 |
| commit | 42c24f1c09b6b8d403ee0940c6f1362249a8b738 (patch) | |
| tree | 5d33b3dc9b083e4515c77c0841c3d0ed47ec6275 | |
| parent | a235f1f94b85df48c92dd2323e777f49ad38afea (diff) | |
| download | illumos-joyent-42c24f1c09b6b8d403ee0940c6f1362249a8b738.tar.gz | |
13263 startd needs to search $(ROOT)/usr/lib/fm for deps
Reviewed by: C Fraire <cfraire@me.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>
| -rw-r--r-- | usr/src/cmd/svc/startd/Makefile | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/usr/src/cmd/svc/startd/Makefile b/usr/src/cmd/svc/startd/Makefile index d9b1c523a7..8b15034344 100644 --- a/usr/src/cmd/svc/startd/Makefile +++ b/usr/src/cmd/svc/startd/Makefile @@ -98,9 +98,17 @@ LDLIBS += \ -lumem \ -luutil +# +# While svc.startd only searches for libfmevent, which is in +# $(ROOT)/lib/fm, when resolving dependencies it needs to know to search +# for those in $(ROOT)/usr/lib/fm. However, we don't need a runpath +# because libfmevent has that properly set already, but it doesn't help +# us during the build. +# LDLIBS_i386 += -lbe -LDLIBS += $(LDLIBS_$(MACH)) -L $(ROOT)/lib/fm -lfmevent -LDFLAGS += -R /lib/fm +LDLIBS += $(LDLIBS_$(MACH)) -L$(ROOT)/lib/fm -lfmevent \ + -L$(ROOT)/usr/lib/fm +LDFLAGS += -R/lib/fm FILEMODE = 0555 |