From ed115af6b22496ae1df0bbed8958581bca227600 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Thu, 29 Apr 2021 09:56:04 -0600 Subject: [PATCH] windows makefile: fix liblz4.dll linking Link "liblz4.dll" with the right LZ4 library for /MT mode. It looks like VS 2017 links anyway, but VS 2015 (and probably earlier) does not link with the wrong library. In a normal build, "liblz4.dll" is not needed, but it's linked in case it turns out to be useful to compress or decompress boot files. A normal build will construct boot files with the intended final compression, at least when all the right flags are passed around to the right places. --- racket/src/worksp/cs/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/racket/src/worksp/cs/Makefile b/racket/src/worksp/cs/Makefile index 953223c8c4..c7bb23df69 100644 --- a/racket/src/worksp/cs/Makefile +++ b/racket/src/worksp/cs/Makefile @@ -10,7 +10,7 @@ LIBS = $(RKTIO_LIB) \ $(SCHEME_LIB_FULL) \ $(WIN32_LIBS) -LZ4_DLL = ..\liblz4.dll +LZ4_DLL = ..\liblz4mt.dll LZ4_LIB = $(SCHEME_DIR)\$(MACHINE)\lz4\lib\liblz4.lib DEST_DLL = ..\..\build\raw_libracketcs.dll @@ -52,7 +52,7 @@ gracket.res: ../gracket/gracket.rc ../gracket/gracket.ico # Useful for adjusting boot file compression: -$(LZ4_DLL): lz4.c lz4.def +$(LZ4_DLL): lz4.c lz4.def $(LZ4_LIB) cl /LD /DLL /Fe$(LZ4_DLL) $(FLAGS) lz4.c $(LZ4_LIB) $(WIN32_LIBS) /link /DEF:lz4.def # Useful for debugging: