diff options
| author | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
|---|---|---|
| committer | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
| commit | 5b2acc0949194447bba6e45a0fa44d0b5f42f208 (patch) | |
| tree | 7ea9eb87bc68fee386dd39035ce715e87a0e673c /usr/src/lib/libsaveargs | |
| parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
| parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
| download | illumos-joyent-gcc9.tar.gz | |
mergegcc9
Diffstat (limited to 'usr/src/lib/libsaveargs')
| -rw-r--r-- | usr/src/lib/libsaveargs/Makefile | 5 | ||||
| -rw-r--r-- | usr/src/lib/libsaveargs/Makefile.com | 3 | ||||
| -rw-r--r-- | usr/src/lib/libsaveargs/Makefile.targ | 10 | ||||
| -rw-r--r-- | usr/src/lib/libsaveargs/amd64/Makefile | 2 |
4 files changed, 4 insertions, 16 deletions
diff --git a/usr/src/lib/libsaveargs/Makefile b/usr/src/lib/libsaveargs/Makefile index bbc26c7e7f..1df37b84eb 100644 --- a/usr/src/lib/libsaveargs/Makefile +++ b/usr/src/lib/libsaveargs/Makefile @@ -33,11 +33,10 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg package := TARGET= package -LIBRARY= libsaveargs.a +LIBRARY= libsaveargs.a # definitions for install_h target HDRS= saveargs.h @@ -53,7 +52,7 @@ $(ROOTHDRDIR)/%: common/% .KEEP_STATE: -all clean clobber delete install lint package: $(SUBDIRS) +all clean clobber delete install package: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libsaveargs/Makefile.com b/usr/src/lib/libsaveargs/Makefile.com index 883afb66c9..3f23249570 100644 --- a/usr/src/lib/libsaveargs/Makefile.com +++ b/usr/src/lib/libsaveargs/Makefile.com @@ -61,7 +61,7 @@ CLOBBERFILES_standalone = $(LINKTEST_OBJ) CLOBBERFILES += $(CLOBBERFILES_$(CURTYPE)) LIBS_standalone = $(STANDLIBRARY) -LIBS_library = $(DYNLIB) $(LINTLIB) +LIBS_library = $(DYNLIB) LIBS = $(LIBS_$(CURTYPE)) MAPFILES = $(COMDIR)/mapfile-vers @@ -75,7 +75,6 @@ ASFLAGS_standalone = -DDIS_STANDALONE ASFLAGS_library = ASFLAGS += -P $(ASFLAGS_$(CURTYPE)) -D_ASM -$(LINTLIB) := SRCS = $(COMDIR)/$(LINTSRC) # We want the thread-specific errno in the library, but we don't want it in # the standalone. $(DTS_ERRNO) is designed to add -D_TS_ERRNO to $(CPPFLAGS), diff --git a/usr/src/lib/libsaveargs/Makefile.targ b/usr/src/lib/libsaveargs/Makefile.targ index f90deed1db..73c8943c76 100644 --- a/usr/src/lib/libsaveargs/Makefile.targ +++ b/usr/src/lib/libsaveargs/Makefile.targ @@ -47,11 +47,6 @@ install.standalone.targ: all.standalone $(INSTALL_DEPS_standalone) all.library.targ: $(LIBS) all.standalone.targ: $(STANDLIBRARY) -lint: $(TYPES:%=lint.%) - -$(TYPES:%=lint.%): - @$(MAKE) lintcheck CURTYPE=$(@:lint.%=%) - $(STANDLIBRARY): $(OBJS) $(LINKTEST_OBJ) $(LD) $(BREDUCE) $(ZDEFS) $(LDFLAGS) -o $@.linktest $(OBJS) $(LINKTEST_OBJ) rm $@.linktest @@ -74,8 +69,3 @@ $(OBJS): objs objs/%.o pics/%.o: $(COMDIR)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -# install rule for lint library target -$(ROOTLINTDIR)/%: $(COMDIR)/% - $(INS.file) - diff --git a/usr/src/lib/libsaveargs/amd64/Makefile b/usr/src/lib/libsaveargs/amd64/Makefile index de0c2793f7..63cf163ffb 100644 --- a/usr/src/lib/libsaveargs/amd64/Makefile +++ b/usr/src/lib/libsaveargs/amd64/Makefile @@ -28,7 +28,7 @@ include ../../Makefile.lib.64 TYPES=library standalone -INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLINT64) $(ROOTLIBS64) +INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLIBS64) INSTALL_DEPS_standalone = $(ROOTLIBS64) include ../Makefile.targ |