diff options
| author | Gary Mills <gary_mills@fastmail.fm> | 2015-09-06 19:00:17 -0500 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2015-09-19 10:07:23 -0400 |
| commit | fca4268092e9961ebb9b5e0098dcebc545023586 (patch) | |
| tree | 369a2700754a9724ba473d19be5eb386a60a58e2 /usr/src/cmd/sgs/yacc | |
| parent | 79c28b707e05fa6746e9e9f99cad98db6b963592 (diff) | |
| download | illumos-joyent-fca4268092e9961ebb9b5e0098dcebc545023586.tar.gz | |
6117 Many small bugs prevent a clean build on SPARC
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/cmd/sgs/yacc')
| -rw-r--r-- | usr/src/cmd/sgs/yacc/Makefile.com | 15 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/yacc/Makefile.targ | 20 |
2 files changed, 16 insertions, 19 deletions
diff --git a/usr/src/cmd/sgs/yacc/Makefile.com b/usr/src/cmd/sgs/yacc/Makefile.com index 4b9a945978..9744f284ea 100644 --- a/usr/src/cmd/sgs/yacc/Makefile.com +++ b/usr/src/cmd/sgs/yacc/Makefile.com @@ -19,6 +19,7 @@ # CDDL HEADER END # # +# Copyright 2015 Gary Mills # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -48,18 +49,23 @@ SRCS= $(COMSRCS) $(LIBSRCS) LIBS = $(DYNLIB) $(LINTLIB) +# Append to LINTFLAGS and LINTFLAGS64 from lib/Makefile.lib +LINTFLAGS += -erroff=E_NAME_MULTIPLY_DEF2 +LINTFLAGS64 += -erroff=E_NAME_MULTIPLY_DEF2 + # Tune ZDEFS to ignore undefined symbols for building the yacc shared library # since these symbols (mainly yyparse) are to be resolved elsewhere. # $(DYNLIB):= ZDEFS = $(ZNODEFS) $(DYNLIBCCC):= ZDEFS = $(ZNODEFS) LINTSRCS= ../common/llib-l$(LIBNAME) +$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) INCLIST= -I../../include -I../../include/$(MACH) CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) -LDLIBS= $(LDLIBS.cmd) +$(PROG):= LDLIBS = $(LDLIBS.cmd) BUILD.AR= $(AR) $(ARFLAGS) $@ `$(LORDER) $(OBJS) | $(TSORT)` -LINTFLAGS= -amux + LINTPOUT= lint.out C99MODE= $(C99_ENABLE) @@ -68,7 +74,6 @@ CFLAGS64 += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-uninitialized -$(LINTLIB):= LINTFLAGS = -nvx $(ROOTPROG):= FILEMODE = 0555 ROOTYACCPAR= $(YACCPAR:%=$(ROOTSHLIBCCS)/%) @@ -79,7 +84,9 @@ ROOTLINT= $(LINTSRCS:../common/%=$(ROOTLINTDIR)/%) DYNLINKLIBDIR= $(ROOTLIBDIR) DYNLINKLIB= $(LIBLINKS:%=$(DYNLINKLIBDIR)/%) -$(DYNLIB) := LDLIBS += -lc +LDLIBS += -lc CLEANFILES += $(LINTPOUT) CLOBBERFILES += $(LIBS) $(LIBRARY) + +lint: lintcheck diff --git a/usr/src/cmd/sgs/yacc/Makefile.targ b/usr/src/cmd/sgs/yacc/Makefile.targ index 87f8c5221e..9cbf1c440f 100644 --- a/usr/src/cmd/sgs/yacc/Makefile.targ +++ b/usr/src/cmd/sgs/yacc/Makefile.targ @@ -19,10 +19,10 @@ # CDDL HEADER END # # +# Copyright 2015 Gary Mills # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # $(PROG): objs .WAIT $(POBJS) @@ -85,19 +85,9 @@ $(DYNLINKLIBDIR)/%: %$(VERS) clean: $(RM) $(POBJS) $(OBJS) $(PICS) $(CLEANFILES) -lint: $(LINTPOUT) $(LINTLIB) +$(LINTLIB): $$(SRCS) + $(LINT.c) -o $(LIBNAME) $(SRCS) > $(LINTOUT) 2>&1 +lintcheck: $$(SRCS) + $(LINT.c) $(LINTCHECKFLAGS) $(SRCS) $(LDLIBS) -LINT_HDR= perl ../../tools/lint_hdr.pl - -$(LINTPOUT): $(SRCS) - $(LINT_HDR) $(PROG) > $(LINTPOUT) - $(LINT_HDR) -s yacc >> $(LINTPOUT) - $(LINT.c) $(COMSRCS) $(LDLIBS) 2>&1 | tee -a $(LINTPOUT) - - $(LINT_HDR) -s liby.so.1 >> $(LINTPOUT) - $(LINT.c) $(LIBSRCS) $(LDLIBS) 2>&1 | tee -a $(LINTPOUT) - - -$(LINTLIB): $(LINTSRCS) - $(LINT.c) -o $(LIBNAME) $(LINTSRCS) |