Skip to content

Commit 9c4aa5c

Browse files
committed
windows use msys bash
1 parent 8a057c0 commit 9c4aa5c

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ jobs:
8585
8686
- name: build sqlite-sync
8787
run: make ${{ matrix.make && matrix.make || ''}}
88+
shell: bash
8889

8990
- name: windows install sqlite3
9091
if: matrix.os == 'windows-latest'

Makefile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ CURL_VERSION ?= 8.12.1
1111
# Set default platform if not specified
1212
ifeq ($(OS),Windows_NT)
1313
PLATFORM := windows
14+
HOST:= windows
1415
else
15-
UNAME_S := $(shell uname -s)
16-
ifeq ($(UNAME_S),Darwin)
16+
HOST = $(shell uname -s | tr '[:upper:]' '[:lower:]')
17+
ifeq ($(HOST),darwin)
1718
PLATFORM := macos
1819
else
19-
PLATFORM := linux
20+
PLATFORM := $(HOST)
2021
endif
2122
endif
2223

@@ -80,7 +81,6 @@ else ifeq ($(PLATFORM),android)
8081
$(error "Android NDK must be set")
8182
endif
8283

83-
HOST = $(shell uname -s | tr '[:upper:]' '[:lower:]')
8484
BIN = $(ANDROID_NDK)/toolchains/llvm/prebuilt/$(HOST)-x86_64/bin
8585

8686
ifneq (,$(filter $(ARCH),arm64 arm64-v8a))
@@ -244,7 +244,11 @@ $(CURL_LIB):
244244
# --without-zsh-functions-dir \
245245
# --without-libgsasl \
246246
247+
ifeq ($(PLATFORM),windows)
248+
"C:/msys64/usr/bin/bash.exe" "cd $(CURL_SRC) && make"
249+
else
247250
cd $(CURL_SRC) && make
251+
endif
248252

249253
mkdir -p $(CURL_DIR)/$(PLATFORM)
250254
mv $(CURL_SRC)/lib/.libs/libcurl.a $(CURL_DIR)/$(PLATFORM)

0 commit comments

Comments
 (0)