summaryrefslogtreecommitdiff
path: root/usr/src/lib/libshell
diff options
context:
space:
mode:
authorJohn Levon <john.levon@joyent.com>2020-05-26 13:57:13 +0000
committerJohn Levon <john.levon@joyent.com>2020-05-26 13:57:13 +0000
commit5b2acc0949194447bba6e45a0fa44d0b5f42f208 (patch)
tree7ea9eb87bc68fee386dd39035ce715e87a0e673c /usr/src/lib/libshell
parent8ca018083101bf1cb175869679bc123187fb1bab (diff)
parent2a1277d3064386cd5c4e372301007aa330bf1d5e (diff)
downloadillumos-joyent-gcc9.tar.gz
mergegcc9
Diffstat (limited to 'usr/src/lib/libshell')
-rw-r--r--usr/src/lib/libshell/Makefile9
-rw-r--r--usr/src/lib/libshell/Makefile.com11
-rw-r--r--usr/src/lib/libshell/i386/Makefile2
-rw-r--r--usr/src/lib/libshell/sparc/Makefile2
4 files changed, 7 insertions, 17 deletions
diff --git a/usr/src/lib/libshell/Makefile b/usr/src/lib/libshell/Makefile
index 1cce2316f0..74fa80c6ea 100644
--- a/usr/src/lib/libshell/Makefile
+++ b/usr/src/lib/libshell/Makefile
@@ -35,20 +35,19 @@ all := TARGET= all
clean := TARGET= clean
clobber := TARGET= clobber
install := TARGET= install
-lint := TARGET= lint
-_msg := TARGET= _msg
+_msg := TARGET= _msg
.KEEP_STATE:
-all clean clobber install lint _msg: $(SUBDIRS)
+all clean clobber install _msg: $(SUBDIRS)
-LIBRARY= libshell.a
+LIBRARY= libshell.a
HDRS= \
history.h \
nval.h \
shell.h
-
+
HDRDIR32= $(MACH)/include/ast
HDRDIR64= $(MACH64)/include/ast
include ../Makefile.asthdr
diff --git a/usr/src/lib/libshell/Makefile.com b/usr/src/lib/libshell/Makefile.com
index b185d93851..9880bf8e12 100644
--- a/usr/src/lib/libshell/Makefile.com
+++ b/usr/src/lib/libshell/Makefile.com
@@ -124,7 +124,7 @@ MAPFILES= ../mapfile-vers
# Set common AST build flags (e.g. C99/XPG6, needed to support the math stuff)
include ../../../Makefile.ast
-LIBS = $(DYNLIB) $(LINTLIB)
+LIBS = $(DYNLIB)
LDLIBS += \
-lcmd \
@@ -134,7 +134,6 @@ LDLIBS += \
-lm \
-lc
-$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
SRCDIR = ../common
@@ -172,12 +171,4 @@ pics/sh/nvdisc.o := CERRWARN += -erroff=E_END_OF_LOOP_CODE_NOT_REACHED
all: mkpicdirs .WAIT $(LIBS)
-#
-# libshell is not lint-clean yet; fake up a target. (You can use
-# "make lintcheck" to actually run lint; please send all lint fixes
-# upstream (to AT&T) so the next update will pull them into ON.)
-#
-lint:
- @ print "usr/src/lib/libshell is not lint-clean: skipping"
-
include ../../Makefile.targ
diff --git a/usr/src/lib/libshell/i386/Makefile b/usr/src/lib/libshell/i386/Makefile
index 79cb51eae6..6c35d1fc88 100644
--- a/usr/src/lib/libshell/i386/Makefile
+++ b/usr/src/lib/libshell/i386/Makefile
@@ -26,4 +26,4 @@
include ../Makefile.com
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/libshell/sparc/Makefile b/usr/src/lib/libshell/sparc/Makefile
index 8c5c13a9b9..b858cee431 100644
--- a/usr/src/lib/libshell/sparc/Makefile
+++ b/usr/src/lib/libshell/sparc/Makefile
@@ -30,4 +30,4 @@ include ../Makefile.com
# (and on 32bit it is close to the barrier)
sparc_C_PICFLAGS = $(C_BIGPICFLAGS)
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)