diff options
| author | Dan McDonald <danmcd@joyent.com> | 2020-11-17 14:48:44 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2020-11-17 14:48:44 -0500 |
| commit | 2d6415143e9c1044d04ebf846f72f232883413cb (patch) | |
| tree | 555fae9f2f89b0c9a4d8c4bbd66b02b70ded9fc7 /usr/src/cmd/cmd-inet | |
| parent | 5a1b3228538dfeb09e05cc2bdfad707ee4d698d7 (diff) | |
| parent | 5a0af8165ce9590e7a18f1ef4f9badc4dd72c6e6 (diff) | |
| download | illumos-joyent-release-20201119.tar.gz | |
[illumos-gate merge]release-20201119
commit 5a0af8165ce9590e7a18f1ef4f9badc4dd72c6e6
13274 enable -fstack-protector-strong by default in user land
commit 6a817834d81cc75ce12d0d393320837b1fec1e85
5788 Want support for GCC's stack protector in libc
commit 350ffdd54baf880f440ddf9697666e283894ded1
13273 want upanic(2)
commit 7fdea60d55a95f0e46066fd021c4ef1b1321bafc
13300 mlxcx_cq_setup() doesn't take required locks for ASSERTs
Merge notes:
- Manifest changes to match package changes (including shipping libssp_ns.a)
- Modified lx_vdso tools to not include SSP, to match other build-only tools.
Diffstat (limited to 'usr/src/cmd/cmd-inet')
| -rw-r--r-- | usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/Makefile b/usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/Makefile index d577640c90..1f7c9b1ef7 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/Makefile +++ b/usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/Makefile @@ -26,7 +26,7 @@ # MINCONN = minconn.so -PASSPROMPT = passprompt.so +PASSPROMPT = passprompt.so PPPOE = pppoe.so LIBRARIES = minconn.so passprompt.so pppoe.so @@ -52,11 +52,8 @@ $(MINCONN):= MAPFILES = mapfile-minconn $(PASSPROMPT):= MAPFILES = mapfile-passprompt $(PPPOE):= MAPFILES = mapfile-pppoe -# A bug in pmake causes redundancy when '+=' is conditionally assigned, so -# '=' is used with extra variables. -XXXLDLIBS = -$(PASSPROMPT):= XXXLDLIBS = -lc -LDLIBS += $(XXXLDLIBS) +$(PASSPROMPT):= LDLIBS += -lc +$(PPPOE):= LDLIBS += -lc CPPFLAGS += -I.. -I$(SRC)/uts/common # XX64 -- this should not be needed -- fix me |