Skip to content

Commit 01ed775

Browse files
committed
Sync cmake : add option to build and link BoringSSL and OpenSSL
1 parent 67421d5 commit 01ed775

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

.github/workflows/build-wheels-cu124-linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Install dependencies
3333
run: |
3434
apt update
35-
apt install -y build-essential cmake ccache curl git libgomp1 libcurl4-openssl-dev
35+
apt install -y build-essential cmake ccache curl git libgomp1 libjpeg-dev libssl-dev
3636
3737
- uses: actions/checkout@v4 # Checkout code
3838
with:
@@ -63,7 +63,7 @@ jobs:
6363
# Add project-specific and feature flags
6464
CMAKE_ARGS="-DGGML_CUDA=on -DCMAKE_CUDA_ARCHITECTURES='70-real;75-real;80-real;86-real;87-real;89-real'"
6565
CMAKE_ARGS="-DGGML_CUDA_FORCE_MMQ=on ${CMAKE_ARGS}"
66-
CMAKE_ARGS="${CMAKE_ARGS} -DLLAMA_CURL=on -DLLAMA_HTTPLIB=on"
66+
CMAKE_ARGS="${CMAKE_ARGS} -DLLAMA_CURL=off -DLLAMA_OPENSSL=on -DLLAMA_HTTPLIB=on"
6767
6868
if [ "${AVXVER}" = "AVX" ]; then
6969
CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX=on -DGGML_AVX2=off -DGGML_FMA=off -DGGML_F16C=off"

.github/workflows/build-wheels-cu126-linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Install dependencies
3333
run: |
3434
apt update
35-
apt install -y build-essential cmake ccache curl git libgomp1 libcurl4-openssl-dev
35+
apt install -y build-essential cmake ccache curl git libgomp1 libjpeg-dev libssl-dev
3636
3737
- uses: actions/checkout@v4 # Checkout code
3838
with:
@@ -63,7 +63,7 @@ jobs:
6363
# Add project-specific and feature flags
6464
CMAKE_ARGS="-DGGML_CUDA=on -DCMAKE_CUDA_ARCHITECTURES='70-real;75-real;80-real;86-real;87-real;89-real'"
6565
CMAKE_ARGS="-DGGML_CUDA_FORCE_MMQ=on ${CMAKE_ARGS}"
66-
CMAKE_ARGS="${CMAKE_ARGS} -DLLAMA_CURL=on -DLLAMA_HTTPLIB=on"
66+
CMAKE_ARGS="${CMAKE_ARGS} -DLLAMA_CURL=off -DLLAMA_OPENSSL=on -DLLAMA_HTTPLIB=on"
6767
6868
if [ "${AVXVER}" = "AVX" ]; then
6969
CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX=on -DGGML_AVX2=off -DGGML_FMA=off -DGGML_F16C=off"

.github/workflows/build-wheels-cu128-linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Install dependencies
3333
run: |
3434
apt update
35-
apt install -y build-essential ccache cmake curl git libgomp1 libcurl4-openssl-dev
35+
apt install -y build-essential ccache cmake curl git libgomp1 libjpeg-dev libssl-dev
3636
3737
- uses: actions/checkout@v4 # Checkout code
3838
with:
@@ -63,7 +63,7 @@ jobs:
6363
# Add project-specific and feature flags
6464
CMAKE_ARGS="-DGGML_CUDA=on -DCMAKE_CUDA_ARCHITECTURES='75-real;80-real;86-real;87-real;89-real;90-real;100-real;101-real;120-real'"
6565
CMAKE_ARGS="-DGGML_CUDA_FORCE_MMQ=on ${CMAKE_ARGS}"
66-
CMAKE_ARGS="${CMAKE_ARGS} -DLLAMA_CURL=on -DLLAMA_HTTPLIB=on"
66+
CMAKE_ARGS="${CMAKE_ARGS} -DLLAMA_CURL=off -DLLAMA_OPENSSL=on -DLLAMA_HTTPLIB=on"
6767
6868
if [ "${AVXVER}" = "AVX" ]; then
6969
CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX=on -DGGML_AVX2=off -DGGML_FMA=off -DGGML_F16C=off"

CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ if (LLAMA_BUILD)
6565
# Disable building curl support
6666
set(LLAMA_CURL OFF CACHE BOOL "llama.cpp: enable curl" FORCE)
6767

68+
if (WIN32 OR APPLE)
69+
# Enable build and link BoringSSL only on Windows and macOS
70+
set(LLAMA_BUILD_BORINGSSL ON CACHE BOOL "llama.cpp: build and link BoringSSL" FORCE)
71+
endif()
72+
6873
# Architecture detection and settings for Apple platforms
6974
if (APPLE)
7075
# Get the target architecture

0 commit comments

Comments
 (0)