1
From 707fbfb32f82f253a1792347ce76bca98679c8d8 Mon Sep 17 00:00:00 2001
2
From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
3
Date: Sun, 28 Aug 2022 09:06:14 +0900
4
Subject: [PATCH 1/2] Fix static link
6
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
8
programs/Makefile | 6 +++---
9
tests/Makefile | 4 +++-
10
2 files changed, 6 insertions(+), 4 deletions(-)
12
diff --git a/programs/Makefile b/programs/Makefile
13
index ace0d03..fc4d6f1 100644
14
--- a/programs/Makefile
15
+++ b/programs/Makefile
16
@@ -91,10 +91,10 @@ lz4-exe.o: lz4-exe.rc
17
$(WINDRES) -i lz4-exe.rc -o lz4-exe.o
19
lz4: $(OBJFILES) lz4-exe.o
20
- $(CC) $(FLAGS) $^ -o $@$(EXT)
21
+ $(CC) $(FLAGS) $^ -o $@$(EXT) -L ../lib -llz4
24
- $(CC) $(FLAGS) $(OBJFILES) -o $@$(EXT) $(LDLIBS)
25
+ $(CC) $(FLAGS) $(OBJFILES) -o $@$(EXT) $(LDLIBS) -L ../lib -llz4
29
@@ -118,7 +118,7 @@ lz4c: lz4
31
lz4c32: CFLAGS += -m32
33
- $(CC) $(FLAGS) $^ -o $@$(EXT)
34
+ $(CC) $(FLAGS) $^ -o $@$(EXT) -L ../lib -llz4
36
lz4.1: lz4.1.md $(LIBVER_SRC)
37
cat $< | $(MD2ROFF) $(MD2ROFF_FLAGS) | $(SED) -n '/^\.\\\".*/!p' > $@
38
diff --git a/tests/Makefile b/tests/Makefile
39
index 93a5581..b48070a 100644
42
@@ -43,6 +43,8 @@ CFLAGS += $(DEBUGFLAGS) $(MOREFLAGS)
43
CPPFLAGS+= -I$(LZ4DIR) -I$(PRGDIR) -DXXH_NAMESPACE=LZ4_
44
FLAGS = $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
46
+export LD_LIBRARY_PATH += $(LZ4DIR)
48
include ../Makefile.inc
50
LZ4 := $(PRGDIR)/lz4$(EXT)
51
@@ -62,7 +64,7 @@ all32: CFLAGS+=-m32
55
- $(MAKE) -C $(PRGDIR) $@ CFLAGS="$(CFLAGS)"
56
+ #$(MAKE) -C $(PRGDIR) $@ CFLAGS="$(CFLAGS)"
59
$(MAKE) -C $(LZ4DIR) $@ CFLAGS="$(CFLAGS)"