Skip to content

Commit 7f05ae7

Browse files
dharmabclaude
andcommitted
Fix macOS CI and Windows CI build failures
macOS: Add -Wno-elaborated-enum-base to suppress Homebrew LLVM errors from Apple SDK headers (vDSP.h) when compiling ggml-blas. Windows: Force "MSYS Makefiles" generator and CMAKE_STATIC_LIBRARY_PREFIX=lib so CMake outputs libggml.a instead of ggml.a, matching what -lggml expects. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 3557a3f commit 7f05ae7

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ BUILD_VARS += CC=$(CC) CXX=$(CXX)
5656
LIBRARY_PATHS := $(LIBRARY_PATHS):$(ABS_WHISPER_CPP_BUILD_DIR)/ggml/src/ggml-metal:$(ABS_WHISPER_CPP_BUILD_DIR)/ggml/src/ggml-blas
5757
# Link OpenMP runtime for ggml-cpu on macOS (Go bindings only specify -fopenmp on Linux)
5858
BUILD_VARS += CGO_LDFLAGS=-fopenmp
59-
WHISPER_CPP_CMAKE_ARGS = -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)
59+
WHISPER_CPP_CMAKE_ARGS = -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX) \
60+
-DCMAKE_C_FLAGS=-Wno-elaborated-enum-base -DCMAKE_CXX_FLAGS=-Wno-elaborated-enum-base
6061
endif
6162

6263
# Windows-specific settings
@@ -67,6 +68,8 @@ SKYEYE_SCALER_BIN = skyeye-scaler.exe
6768
# Override Windows Go environment with MSYS2 UCRT64 Go environment
6869
GO = /ucrt64/bin/go
6970
GOBUILDVARS += GOROOT="/ucrt64/lib/go" GOPATH="/ucrt64"
71+
# CMake on MSYS2 omits the "lib" prefix; force it so -lggml works
72+
WHISPER_CPP_CMAKE_ARGS = -G "MSYS Makefiles" -DCMAKE_STATIC_LIBRARY_PREFIX=lib
7073
# Static linking on Windows to avoid MSYS2 dependency at runtime
7174
LIBRARIES = opus soxr
7275
CFLAGS = $(shell pkg-config $(LIBRARIES) --cflags --static)

0 commit comments

Comments
 (0)