Skip to content

Commit 34dc114

Browse files
committed
fix(build): update Ubuntu version in workflow and remove deprecated C++ ABI flags for Linux builds
1 parent 06298ca commit 34dc114

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
include:
18-
- os: ubuntu-latest
18+
- os: ubuntu-22.04
1919
arch: x86_64
2020
name: linux
2121
make: LLAMA="-DGGML_NATIVE=OFF -DGGML_VULKAN=ON -DGGML_OPENCL=ON -DGGML_LLAMAFILE=ON" WHISPER="-DGGML_VULKAN=ON -DGGML_OPENCL=ON -DGGML_LLAMAFILE=ON"

Makefile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -253,12 +253,9 @@ else ifeq ($(PLATFORM),isim)
253253
else # linux
254254
TARGET := $(DIST_DIR)/ai.so
255255
LDFLAGS += -shared
256-
# Use older C++ ABI for better compatibility
257-
CFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0
258-
LLAMA_OPTIONS += -DGGML_OPENMP=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=0"
259-
WHISPER_OPTIONS += -DGGML_OPENMP=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=0"
260-
MINIAUDIO_OPTIONS += -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=0"
261256
MINIAUDIO_LDFLAGS += -lpthread -lm
257+
LLAMA_OPTIONS += -DGGML_OPENMP=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON
258+
WHISPER_OPTIONS += -DGGML_OPENMP=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON
262259
STRIP = strip --strip-unneeded $@
263260
endif
264261

0 commit comments

Comments
 (0)