Fix build (#512)

* Update CMakeLists.txt to link C++ symbols * Optimize Dockerfile
litespeedtech · Nov 14, 2024 · 232da0e · 232da0e
1 parent 6ed1d09
commit 232da0e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,9 @@
 cmake_minimum_required(VERSION 3.0...3.23)
 
 
-PROJECT(lsquic C)
+PROJECT(lsquic C CXX)
+
+SET(LIBS "-lstdc++")
 
 OPTION(LSQUIC_FIU "Use Fault Injection in Userspace (FIU)" OFF)
 OPTION(LSQUIC_BIN "Compile example binaries that use the library" ON)

diff --git a/Dockerfile b/Dockerfile
@@ -19,15 +19,14 @@ WORKDIR /src
 RUN mkdir /src/lsquic
 COPY ./ /src/lsquic/
 
-RUN git clone https://github.com/google/boringssl.git && \
+RUN git clone --depth=1 https://github.com/google/boringssl.git && \
     cd boringssl && \
-    git checkout 9fc1c33e9c21439ce5f87855a6591a9324e569fd && \
     cmake . && \
     make
 
 ENV EXTRA_CFLAGS -DLSQUIC_QIR=1
 RUN cd /src/lsquic && \
-    cmake -DBORINGSSL_DIR=/src/boringssl . && \
+    cmake -DBORINGSSL_DIR=/src/boringssl -D BORINGSSL_LIB_crypto=/src/boringssl/build/crypto/libcrypto.a -DBORINGSSL_LIB_SSL=/src/boringssl/build/ssl/libssl.a . && \
     make
 
 RUN cd lsquic && cp bin/http_client /usr/bin/ && cp bin/http_server /usr/bin