f2f67b96a3
Patched Makefile to also include
2d433a9b43.
The patch is available in 4.2.0. I'll try upgrading wrk after OpenSSL 3
rebuild
32 lines
976 B
Diff
32 lines
976 B
Diff
--- ./Makefile.orig 2022-02-21 18:50:35.103778638 +0530
|
|
+++ ./Makefile 2022-02-21 18:51:47.323778610 +0530
|
|
@@ -1,5 +1,5 @@
|
|
-CFLAGS += -std=c99 -Wall -O2 -D_REENTRANT
|
|
-LIBS := -lpthread -lm -lssl -lcrypto
|
|
+CFLAGS += -std=c99 -Wall -D_REENTRANT
|
|
+LIBS := -lm -lssl -lcrypto
|
|
|
|
TARGET := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown)
|
|
|
|
@@ -31,7 +31,7 @@
|
|
LDFLAGS += -L$(ODIR)/lib
|
|
|
|
ifneq ($(WITH_LUAJIT),)
|
|
- CFLAGS += -I$(WITH_LUAJIT)/include
|
|
+ CFLAGS += -I$(WITH_LUAJIT)/include/luajit-2.1
|
|
LDFLAGS += -L$(WITH_LUAJIT)/lib
|
|
else
|
|
CFLAGS += -I$(ODIR)/include/luajit-2.1
|
|
@@ -59,9 +59,9 @@
|
|
$(ODIR):
|
|
@mkdir -p $@
|
|
|
|
-$(ODIR)/bytecode.o: src/wrk.lua
|
|
+$(ODIR)/bytecode.c: src/wrk.lua
|
|
@echo LUAJIT $<
|
|
- @$(SHELL) -c 'PATH=obj/bin:$(PATH) luajit -b $(CURDIR)/$< $(CURDIR)/$@'
|
|
+ @$(SHELL) -c 'PATH=obj/bin:$(PATH) luajit -b -a $(_ARCH) $(CURDIR)/$< $(CURDIR)/$@'
|
|
|
|
$(ODIR)/version.o:
|
|
@echo 'const char *VERSION="$(VER)";' | $(CC) -xc -c -o $@ -
|