aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jarred Sumner <jarred@jarredsumner.com> 2022-04-04 07:07:39 -0700
committerGravatar Jarred Sumner <jarred@jarredsumner.com> 2022-04-04 07:07:39 -0700
commit779e5ccc1621c3a7dffa28e247510af4c8ed65f3 (patch)
tree76ff46b22d2fbcc9f92133a839a148106613beb4
parent7b19de97d41d8af1cdd80a8499699db0da84c0e3 (diff)
downloadbun-779e5ccc1621c3a7dffa28e247510af4c8ed65f3.tar.gz
bun-779e5ccc1621c3a7dffa28e247510af4c8ed65f3.tar.zst
bun-779e5ccc1621c3a7dffa28e247510af4c8ed65f3.zip
Add zlib for uws
-rw-r--r--Dockerfile1
-rw-r--r--Makefile2
2 files changed, 2 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index 4d64869d0..05ab45d45 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -119,6 +119,7 @@ ARG BUN_DIR=${GITHUB_WORKSPACE}/bun
COPY Makefile ${BUN_DIR}/Makefile
COPY src/deps/uws ${BUN_DIR}/src/deps/uws
+COPY src/deps/zlib ${BUN_DIR}/src/deps/zlib
COPY src/deps/libuwsockets.cpp ${BUN_DIR}/src/deps/libuwsockets.cpp
COPY src/deps/_libusockets.h ${BUN_DIR}/src/deps/_libusockets.h
diff --git a/Makefile b/Makefile
index 5aa73b037..617520658 100644
--- a/Makefile
+++ b/Makefile
@@ -458,7 +458,7 @@ build-obj-safe:
UWS_CC_FLAGS = -pthread -DLIBUS_USE_OPENSSL=1 -DUWS_HTTPRESPONSE_NO_WRITEMARK=1 -DLIBUS_USE_BORINGSSL=1 -DWITH_BORINGSSL=1 -Wpedantic -Wall -Wextra -Wsign-conversion -Wconversion $(UWS_INCLUDE) -DUWS_WITH_PROXY
UWS_CXX_FLAGS = $(UWS_CC_FLAGS) -std=gnu++17
-UWS_LDFLAGS = -I$(BUN_DEPS_DIR)/boringssl/include
+UWS_LDFLAGS = -I$(BUN_DEPS_DIR)/boringssl/include -I$(ZLIB_INCLUDE_DIR)
usockets:
rm -rf $(BUN_DEPS_DIR)/uws/uSockets/*.o $(BUN_DEPS_DIR)/uws/uSockets/**/*.o $(BUN_DEPS_DIR)/uws/uSockets/*.a