diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2018-02-11 18:58:28 +0000 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2020-10-13 13:51:13 -0400 |
| commit | 85f4cb87104c72587029a6e0f1663332c85ba118 (patch) | |
| tree | 5ebef4ca549bc6422ac6b0627c440e7a7fbab167 /usr/src/cmd/sendmail | |
| parent | 0a36db39c3cd88f4799ecd9db875f43d834d0a81 (diff) | |
| download | illumos-joyent-85f4cb87104c72587029a6e0f1663332c85ba118.tar.gz | |
13184 Stop translating ld(1) options through cw(1)
Reviewed by: Jason King <jason.brian.king+illumos@gmail.com>
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Approved by: Robert Mustacchi <rm@fingolfin.org>
Diffstat (limited to 'usr/src/cmd/sendmail')
| -rw-r--r-- | usr/src/cmd/sendmail/src/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/cmd/sendmail/util/Makefile | 11 |
2 files changed, 5 insertions, 10 deletions
diff --git a/usr/src/cmd/sendmail/src/Makefile b/usr/src/cmd/sendmail/src/Makefile index 8791902399..19698de5ad 100644 --- a/usr/src/cmd/sendmail/src/Makefile +++ b/usr/src/cmd/sendmail/src/Makefile @@ -42,7 +42,7 @@ OBJS= alias.o arpadate.o bf.o collect.o conf.o control.o convtime.o daemon.o \ SRCS= $(OBJS:%.o=%.c) MAPFILES = $(MAPFILE.INT) $(MAPFILE.NGB) -LDFLAGS += $(MAPFILES:%=-M%) +LDFLAGS += $(MAPFILES:%=-Wl,-M%) LDLIBS += ../libsmutil/libsmutil.a ../libsm/libsm.a -lresolv -lsocket \ -lnsl ../db/libdb.a -lldap -lsldap -lwrap -lumem \ @@ -83,6 +83,4 @@ $(ROOTSYMLINKS): clean: $(RM) $(PROG) $(OBJS) -lint: lint_SRCS - include ../../Makefile.targ diff --git a/usr/src/cmd/sendmail/util/Makefile b/usr/src/cmd/sendmail/util/Makefile index 455879af02..0e5e6ee8e3 100644 --- a/usr/src/cmd/sendmail/util/Makefile +++ b/usr/src/cmd/sendmail/util/Makefile @@ -27,7 +27,7 @@ include ../../Makefile.cmd include ../Makefile.cmd -PROG= mailstats mconnect vacation mailcompat praliases +PROG= mailstats mconnect vacation mailcompat praliases LIBPROG= mail.local smrsh @@ -38,11 +38,11 @@ LIBSMTPSMPROG= mailq # $(PROG) by default CLOBBERFILES= $(LIBPROG) $(USRSBINPROG) $(LIBSMTPSMPROG) -OBJS= $(PROG:%=%.o) +OBJS= $(PROG:%=%.o) .PARALLEL: $(OBJS) $(PROG) $(LIBPROG) $(USRSBINPROG) -SRCS= $(PROG:%=%.c) +SRCS= $(PROG:%=%.c) editmap := LDLIBS += -lldap mail.local := LDLIBS += -lsocket -lnsl -lmail -lldap @@ -65,7 +65,7 @@ CPPFLAGS = $(INCPATH) $(ENVDEF) $(SUNENVDEF) $(DBMDEF) $(CPPFLAGS.sm) # Nearly every support application provides sleep(). This isn't incompatible # with libc, but can be confined to the applications themselves. -LDFLAGS += $(MAPFILE.NGB:%=-M%) +LDFLAGS += $(MAPFILE.NGB:%=-Wl,-M%) .KEEP_STATE: @@ -119,7 +119,4 @@ install: all $(ROOTPROG) $(ROOTLIB)/mail.local $(ROOTLIB)/smrsh \ clean: $(RM) $(OBJS) *.o -lint: lint_PROG - - include ../../Makefile.targ |