diff options
| author | Toomas Soome <tsoome@me.com> | 2019-09-09 13:10:39 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-09-27 21:39:17 +0300 |
| commit | 10ae99ee6a0e5168918d2bba208bcf536edb08f7 (patch) | |
| tree | 329ad2ea86b264ce2350942fd309353af411d26f /usr/src/boot/lib/libstand | |
| parent | f2211ffec9a7ac3c1efc6de9347072f816f10a60 (diff) | |
| download | illumos-joyent-10ae99ee6a0e5168918d2bba208bcf536edb08f7.tar.gz | |
11667 remove duplicate lz4 implementations
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/boot/lib/libstand')
| -rw-r--r-- | usr/src/boot/lib/libstand/Makefile.inc | 5 | ||||
| -rw-r--r-- | usr/src/boot/lib/libstand/zfs/Makefile.inc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/usr/src/boot/lib/libstand/Makefile.inc b/usr/src/boot/lib/libstand/Makefile.inc index 6c46fdeefd..00c1e34664 100644 --- a/usr/src/boot/lib/libstand/Makefile.inc +++ b/usr/src/boot/lib/libstand/Makefile.inc @@ -163,6 +163,11 @@ libstand_gzguts.h: $(ZLIB)/gzguts.h CLEANFILES += libstand_zutil.h libstand_gzguts.h +# lz4 decompression functionality +lz4.o := CPPFLAGS += -I$(LZ4) +SRCS += $(LZ4)/lz4.c +OBJS += lz4.o + # io routines SRCS += $(SASRC)/closeall.c $(SASRC)/dev.c \ $(SASRC)/ioctl.c $(SASRC)/nullfs.c \ diff --git a/usr/src/boot/lib/libstand/zfs/Makefile.inc b/usr/src/boot/lib/libstand/zfs/Makefile.inc index 90cfb8e2f8..3596dd3a26 100644 --- a/usr/src/boot/lib/libstand/zfs/Makefile.inc +++ b/usr/src/boot/lib/libstand/zfs/Makefile.inc @@ -29,7 +29,7 @@ OBJS += skein_block.o OBJS += list.o zfs.o := CPPFLAGS += -I../../common -zfs.o := CPPFLAGS += -I../../../cddl/boot/zfs +zfs.o := CPPFLAGS += -I../../../cddl/boot/zfs -I$(LZ4) # Do not unroll skein loops, reduce code size skein_block.o := CPPFLAGS += -DSKEIN_LOOP=111 |