diff options
| author |  Jarred SUmner <jarred@jarredsumner.com>
| 2022-04-05 00:01:54 -0700 |
|---|---|---|
| committer | Jarred SUmner <jarred@jarredsumner.com>
| 2022-04-05 00:01:54 -0700 |
| commit | 17b9167e527a1a7abcae0af581180467ca665da9 (patch) | |
| tree | 45cd874a6888a522766cec4fb260923597b26618 | |
| parent | 30542225c6e140c900078538a6a563561005411b (diff) | |
| download | bun-17b9167e527a1a7abcae0af581180467ca665da9.tar.gz bun-17b9167e527a1a7abcae0af581180467ca665da9.tar.zst bun-17b9167e527a1a7abcae0af581180467ca665da9.zip | |
Fix linking bug?
| -rw-r--r-- | Dockerfile | 1 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | src/javascript/jsc/bindings/bindings.cpp | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile index 8be1e1ac2..f48c67179 100644 --- a/Dockerfile +++ b/Dockerfile @@ -122,6 +122,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/boringssl/include ${BUN_DIR}/src/deps/boringssl/include COPY src/deps/libuwsockets.cpp ${BUN_DIR}/src/deps/libuwsockets.cpp COPY src/deps/_libusockets.h ${BUN_DIR}/src/deps/_libusockets.h @@ -302,7 +302,7 @@ ARCHIVE_FILES = $(ARCHIVE_FILES_WITHOUT_LIBCRYPTO) -lcrypto ifeq ($(OS_NAME), darwin) ARCHIVE_FILES += $(wildcard $(BUN_DEPS_DIR)/uws/uSockets/src/*.o) $(wildcard $(BUN_DEPS_DIR)/uws/uSockets/src/**/*.o) $(BUN_DEPS_OUT_DIR)/libuwsockets.o else - ARCHIVE_FILES += $(BUN_DEPS_OUT_DIR)/uSockets.a $(BUN_DEPS_OUT_DIR)/libuwsockets.o + ARCHIVE_FILES += -lusockets -luwsockets endif STATIC_MUSL_FLAG ?= @@ -481,10 +481,10 @@ usockets: $(CXX) -fPIC $(CXXFLAGS) $(UWS_CXX_FLAGS) -Isrc $(UWS_LDFLAGS) -g $(DEFAULT_LINKER_FLAGS) $(PLATFORM_LINKER_FLAGS) $(OPTIMIZATION_LEVEL) -g -c *.cpp; cd $(BUN_DEPS_DIR)/uws/uSockets && \ - $(AR) rcvs $(BUN_DEPS_OUT_DIR)/uSockets.a src/*.o src/eventing/*.o src/crypto/*.o + $(AR) rcvs $(BUN_DEPS_OUT_DIR)/libusockets.a src/*.o src/eventing/*.o src/crypto/*.o uws: usockets - $(CXX) -fPIC -I$(BUN_DEPS_DIR)/uws/uSockets/src $(CLANG_FLAGS) $(CFLAGS) $(UWS_CXX_FLAGS) $(UWS_LDFLAGS) $(PLATFORM_LINKER_FLAGS) -c -I$(BUN_DEPS_DIR) $(BUN_DEPS_OUT_DIR)/uSockets.a $(BUN_DEPS_DIR)/libuwsockets.cpp -o $(BUN_DEPS_OUT_DIR)/libuwsockets.o + $(CXX) -fPIC -I$(BUN_DEPS_DIR)/uws/uSockets/src $(CLANG_FLAGS) $(CFLAGS) $(UWS_CXX_FLAGS) $(UWS_LDFLAGS) $(PLATFORM_LINKER_FLAGS) -c -I$(BUN_DEPS_DIR) $(BUN_DEPS_OUT_DIR)/libusockets.a $(BUN_DEPS_DIR)/libuwsockets.cpp -o $(BUN_DEPS_OUT_DIR)/libuwsockets.o diff --git a/src/javascript/jsc/bindings/bindings.cpp b/src/javascript/jsc/bindings/bindings.cpp index a0e5fe4a9..a55e5715d 100644 --- a/src/javascript/jsc/bindings/bindings.cpp +++ b/src/javascript/jsc/bindings/bindings.cpp @@ -53,7 +53,6 @@ #include "DOMURL.h" #include "JSDOMURL.h" -#include "_libusockets.h" #include <string_view> #include <uws/src/App.h> #include <uws/uSockets/src/internal/internal.h> |