diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-06 12:30:01 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-06 12:30:01 +0000 |
| commit | e7a46c7be17beafa9e5973e0aa2e5a18d38db82f (patch) | |
| tree | 9eda57d83b8023583d3473bfd34b9238b1287819 /usr/src/lib/fm/topo | |
| parent | 0efa232c593d8fe393b56fb1ff4dda751660b3b3 (diff) | |
| parent | 5801b0f01c3c34499a929ed96164a5a68b470945 (diff) | |
| download | illumos-joyent-e7a46c7be17beafa9e5973e0aa2e5a18d38db82f.tar.gz | |
[illumos-gate merge]
commit 5801b0f01c3c34499a929ed96164a5a68b470945
12217 add ld assert-deflib and guidance to gate build
commit 948761701ebc8a0cf820a973780b2fbb931c4390
12262 Suboptimal vmem hash table slows down boot
commit cdd7a662d2c0914e93e1daa44cebae7003c99777
12254 python changes have broken the zfs test suite
Conflicts:
usr/src/lib/libzonecfg/Makefile.com
usr/src/lib/libc/sparcv9/Makefile.com
usr/src/lib/libc/sparc/Makefile.com
usr/src/lib/libc/i386/Makefile.com
usr/src/lib/libc/amd64/Makefile
usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com
usr/src/lib/Makefile
usr/src/cmd/sendmail/src/Makefile
usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile
Diffstat (limited to 'usr/src/lib/fm/topo')
| -rw-r--r-- | usr/src/lib/fm/topo/libtopo/Makefile | 5 | ||||
| -rw-r--r-- | usr/src/lib/fm/topo/libtopo/Makefile.com | 13 |
2 files changed, 3 insertions, 15 deletions
diff --git a/usr/src/lib/fm/topo/libtopo/Makefile b/usr/src/lib/fm/topo/libtopo/Makefile index 1990c740d9..556eddfdc4 100644 --- a/usr/src/lib/fm/topo/libtopo/Makefile +++ b/usr/src/lib/fm/topo/libtopo/Makefile @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../../Makefile.lib include ../../Makefile.lib @@ -38,11 +36,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: install_h .WAIT $(SUBDIRS) diff --git a/usr/src/lib/fm/topo/libtopo/Makefile.com b/usr/src/lib/fm/topo/libtopo/Makefile.com index d50d99434d..e3b18ffa3a 100644 --- a/usr/src/lib/fm/topo/libtopo/Makefile.com +++ b/usr/src/lib/fm/topo/libtopo/Makefile.com @@ -69,7 +69,7 @@ include ../../../../Makefile.lib include ../../../Makefile.lib SRCS = $(BUILTINSRCS:%.c=../common/%.c) $(LIBSRCS:%.c=../common/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common @@ -84,24 +84,15 @@ CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-parentheses -LINTFLAGS = -msux -LINTFLAGS64 = -msux -m64 - $(DYNLIB) := LDLIBS += \ -lnvpair -lelf -lumem -lxml2 -lkstat -luuid -ldevinfo \ -lsmbios -lc -ldevid -lipmi -lscf -lpcidb - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -$(LINTLIB) := LINTFLAGS = -nsvx -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 -$(LINTLIB) := LDLIBS += -lnvpair -lumem -lc +NATIVE_LIBS += libxml2.so .KEEP_STATE: all: $(LIBS) -lint: $(LINTLIB) lintcheck - pics/%.o: ../$(MACH)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) |