diff options
| author | Jason King <jason.king@joyent.com> | 2020-10-14 14:35:05 +0000 |
|---|---|---|
| committer | Jason King <jason.king@joyent.com> | 2020-10-14 14:35:05 +0000 |
| commit | f73a49a1df8de3160b1a04d8af655f8764143860 (patch) | |
| tree | b8edab75e701fc550d11456bfc2759ba2538aa46 /usr/src/ucblib/libucb | |
| parent | 56f500fd7befb8f09a27bce42ad195bd6b4aa682 (diff) | |
| parent | 35abe3277cc67d1a650f8fd7ce718b89fbece04d (diff) | |
| download | illumos-joyent-f73a49a1df8de3160b1a04d8af655f8764143860.tar.gz | |
[illumos-gate merge]
commit 35abe3277cc67d1a650f8fd7ce718b89fbece04d
13215 qsort_r(3C) manual synopsis was botched
commit 85f4cb87104c72587029a6e0f1663332c85ba118
13184 Stop translating ld(1) options through cw(1)
commit 0a36db39c3cd88f4799ecd9db875f43d834d0a81
13210 Removing multiple links from aggr leaves last link dangling
Conflicts:
usr/src/uts/sun4u/opl/unix/Makefile
usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com
usr/src/cmd/rcap/rcapstat/Makefile
usr/src/cmd/cmd-inet/usr.sbin/snoop/Makefile
usr/src/cmd/cmd-inet/usr.sbin/Makefile
Diffstat (limited to 'usr/src/ucblib/libucb')
| -rw-r--r-- | usr/src/ucblib/libucb/amd64/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/ucblib/libucb/sparcv9/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/ucblib/libucb/amd64/Makefile b/usr/src/ucblib/libucb/amd64/Makefile index 564565f610..5e1a2ba04a 100644 --- a/usr/src/ucblib/libucb/amd64/Makefile +++ b/usr/src/ucblib/libucb/amd64/Makefile @@ -29,7 +29,7 @@ include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 DYNFLAGS += $(DYNFLAGS64) -BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/lib/$(MACH64) $(LDLIBS) +BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/lib/$(MACH64) $(LDLIBS) # amd64-specific rule pics/%.o: ../$(MACH)/sys/%.c diff --git a/usr/src/ucblib/libucb/sparcv9/Makefile b/usr/src/ucblib/libucb/sparcv9/Makefile index 97883b2a05..5ff8fa00b1 100644 --- a/usr/src/ucblib/libucb/sparcv9/Makefile +++ b/usr/src/ucblib/libucb/sparcv9/Makefile @@ -33,7 +33,7 @@ include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 DYNFLAGS += $(DYNFLAGS64) -BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/lib/$(MACH64) $(LDLIBS) +BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/lib/$(MACH64) $(LDLIBS) BUILD.s= $(AS) $(ASFLAGS) -xarch=v9 -D__sparcv9 $< -o $@ # sparcv9-specific rule |