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/svc | |
| parent | 0a36db39c3cd88f4799ecd9db875f43d834d0a81 (diff) | |
| download | illumos-gate-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/svc')
| -rw-r--r-- | usr/src/cmd/svc/svccfg/Makefile | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/usr/src/cmd/svc/svccfg/Makefile b/usr/src/cmd/svc/svccfg/Makefile index 16312b56f7..e32c70e8ac 100644 --- a/usr/src/cmd/svc/svccfg/Makefile +++ b/usr/src/cmd/svc/svccfg/Makefile @@ -35,9 +35,6 @@ SRCS = svccfg_main.c \ svccfg_xml.c \ svccfg_help.c -LNTS = $(SRCS:%.c=%.ln) \ - manifest_find.ln \ - manifest_hash.ln MYOBJS = $(SRCS:%.c=%.o) \ svccfg_grammar.o \ @@ -68,7 +65,7 @@ $(NATIVE_BUILD)OBJS = $(MYOBJS:%.o=%-native.o) # still export a number of "yy*" (libl) interfaces. Reduce all other symbols # to local scope. MAPFILES += $(MAPFILE.LEX) $(MAPFILE.NGB) -MAPOPTS = $(MAPFILES:%=-M%) +MAPOPTS = $(MAPFILES:%=-Wl,-M%) MYCPPFLAGS = -I ../common -I$(ADJUNCT_PROTO)/usr/include/libxml2 CPPFLAGS += $(MYCPPFLAGS) @@ -102,9 +99,6 @@ LIBSCF = $(SRC)/lib/libscf LIBTECLA = $(SRC)/lib/libtecla # just for the header LIBUUTIL = $(SRC)/lib/libuutil -lint := LINTFLAGS = -mux -lint := SVCCFG_EXTRA_LIBS = -lscf -ll -luutil -lumem -lmd5 -lnvpair - LDLIBS += $(SVCCFG_EXTRA_LIBS) $(NATIVE_BUILD)CC = $(NATIVECC) @@ -128,7 +122,7 @@ svccfg_lex.o svccfg_grammar.o := CCVERBOSE = svccfg_help.po := XGETFLAGS = -a .KEEP_STATE: -.PARALLEL: $(OBJS) $(LNTS) +.PARALLEL: $(OBJS) all debug: $(PROG) @@ -160,10 +154,7 @@ svccfg_grammar.h svccfg_grammar.c: svccfg.y @$(MV) y.tab.c svccfg_grammar.c clean: FRC - $(RM) $(MYOBJS) $(MYOBJS:%.o=%-native.o) $(LNTS) - -lint: $(LNTS) - $(LINT.c) $(LINTFLAGS) $(LNTS) $(LDLIBS) + $(RM) $(MYOBJS) $(MYOBJS:%.o=%-native.o) %-native.o: %.c $(COMPILE.c) -o $@ $< @@ -177,9 +168,6 @@ lint: $(LNTS) $(COMPILE.c) $(OUTPUT_OPTION) $< $(POST_PROCESS_O) -%.ln: ../common/%.c - $(LINT.c) $(OUTPUT_OPTION) -c $< - include ../../Makefile.targ FRC: |