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/tools/vtfontcvt | |
| 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/tools/vtfontcvt')
| -rw-r--r-- | usr/src/tools/vtfontcvt/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/usr/src/tools/vtfontcvt/Makefile b/usr/src/tools/vtfontcvt/Makefile index 1f8d598891..166022685a 100644 --- a/usr/src/tools/vtfontcvt/Makefile +++ b/usr/src/tools/vtfontcvt/Makefile @@ -19,6 +19,7 @@ CMDDIR= $(SRC)/cmd/vtfontcvt include ../Makefile.tools include $(CMDDIR)/Makefile.common +NATIVE_LIBS += libumem.so CPPFLAGS += -I../../uts/common .KEEP_STATE: |