summaryrefslogtreecommitdiff
path: root/usr/src/cmd/fwflash
diff options
context:
space:
mode:
authorBill Taylor <Bill.Taylor@Sun.COM>2009-05-20 07:52:25 -0700
committerBill Taylor <Bill.Taylor@Sun.COM>2009-05-20 07:52:25 -0700
commitfa07eb87a1d9d2451a6b00545db4e1d2fba944b4 (patch)
tree496ffa972eb8efaedaeb0f01a31bbaaaa0f8f823 /usr/src/cmd/fwflash
parent21804b568b041d9baf8a60d992dc93c72ff4c7ed (diff)
downloadillumos-joyent-fa07eb87a1d9d2451a6b00545db4e1d2fba944b4.tar.gz
6840264 "fwflash -f file -d hermon_device" has ld.so.1 reported errors after CR 6808773
Diffstat (limited to 'usr/src/cmd/fwflash')
-rw-r--r--usr/src/cmd/fwflash/plugins/i386/Makefile4
-rw-r--r--usr/src/cmd/fwflash/plugins/sparc/Makefile4
2 files changed, 6 insertions, 2 deletions
diff --git a/usr/src/cmd/fwflash/plugins/i386/Makefile b/usr/src/cmd/fwflash/plugins/i386/Makefile
index 068a041c0d..66b1a29458 100644
--- a/usr/src/cmd/fwflash/plugins/i386/Makefile
+++ b/usr/src/cmd/fwflash/plugins/i386/Makefile
@@ -50,7 +50,9 @@ LDLIBS += -ldevinfo -lumem -lc
DYNFLAGS += -Bdynamic
LIBS= $(DYNLIB)
-BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS)
+BUILD.SO= $(LD) -o $@ $(HERMON_LDFLAGS) -G $(DYNFLAGS)
+
+hermon-MELLANOX.so := HERMON_LDFLAGS += -N/usr/lib/fwflash/identify/hermon.so
%.o: ../vendor/%.c
$(COMPILE.c) $<
diff --git a/usr/src/cmd/fwflash/plugins/sparc/Makefile b/usr/src/cmd/fwflash/plugins/sparc/Makefile
index d5ca244954..cbc156b6e5 100644
--- a/usr/src/cmd/fwflash/plugins/sparc/Makefile
+++ b/usr/src/cmd/fwflash/plugins/sparc/Makefile
@@ -50,7 +50,9 @@ LDLIBS += -ldevinfo -lumem -lc
DYNFLAGS += -Bdynamic
LIBS= $(DYNLIB)
-BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS)
+BUILD.SO= $(LD) -o $@ $(HERMON_LDFLAGS) -G $(DYNFLAGS)
+
+hermon-MELLANOX.so := HERMON_LDFLAGS += -N/usr/lib/fwflash/identify/hermon.so
%.o: ../vendor/%.c
$(COMPILE.c) $<