Skip to content

Commit b5780af

Browse files
committed
do not change CMAKE_SYSTEM_PROCESSOR in toolchain file
1 parent 6ae7a92 commit b5780af

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ jobs:
816816
- build: 'openblas-x64'
817817
defines: '-G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/x64-windows-llvm.cmake -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_RPC=ON -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DGGML_OPENMP=OFF -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=OpenBLAS -DBLAS_INCLUDE_DIRS="$env:RUNNER_TEMP/openblas/include" -DBLAS_LIBRARIES="$env:RUNNER_TEMP/openblas/lib/openblas.lib"'
818818
- build: 'vulkan-x64'
819-
defines: '-DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_RPC=ON -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DGGML_VULKAN=ON'
819+
defines: '-G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/x64-windows-llvm.cmake -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_RPC=ON -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DGGML_OPENMP=OFF -DGGML_VULKAN=ON'
820820
- build: 'llvm-arm64'
821821
defines: '-G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/arm64-windows-llvm.cmake -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON'
822822
- build: 'llvm-arm64-opencl-adreno'

cmake/x64-windows-llvm.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
set( CMAKE_SYSTEM_NAME Windows )
2-
set( CMAKE_SYSTEM_PROCESSOR x86_64 )
1+
# set( CMAKE_SYSTEM_NAME Windows )
2+
# set( CMAKE_SYSTEM_PROCESSOR x86_64 )
33

44
set( CMAKE_C_COMPILER clang )
55
set( CMAKE_CXX_COMPILER clang++ )

0 commit comments

Comments
 (0)