MIRROR: javascript for 🐜's, a tiny runtime with big ambitions
use clang64 instead of minGW64
+73
-26
+28
-2
.github/actions/build-native-deps/action.yml
+28
-2
.github/actions/build-native-deps/action.yml
···
76
76
if: steps.cache.outputs.cache-hit != 'true' && contains(inputs.deps, 'mbedtls')
77
77
shell: bash
78
78
run: |
79
+
if [[ "$RUNNER_OS" == "Windows" ]]; then
80
+
export PATH="$(cygpath "$RUNNER_TEMP/msys64/clang64/bin"):$PATH"
81
+
fi
79
82
git clone --depth 1 --branch mbedtls-${{ inputs.mbedtls_version }} --recurse-submodules https://github.com/Mbed-TLS/mbedtls.git /tmp/mbedtls
80
83
cd /tmp/mbedtls
81
84
CMAKE_GENERATOR="${{ inputs.cmake_generator }}"
82
-
CC=${{ inputs.cc }} cmake -B build \
85
+
CMAKE_ARGS="-DCMAKE_C_COMPILER=${{ inputs.cc }}"
86
+
if [[ "$RUNNER_OS" == "Windows" ]]; then
87
+
AR_PATH="$(which ${{ inputs.ar }})"
88
+
RANLIB_PATH="$(which ${{ inputs.ranlib }})"
89
+
CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_AR=$AR_PATH -DCMAKE_RANLIB=$RANLIB_PATH"
90
+
fi
91
+
if [[ -n "${{ inputs.cxx }}" ]]; then
92
+
CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_CXX_COMPILER=${{ inputs.cxx }}"
93
+
fi
94
+
cmake -B build \
83
95
${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"} \
96
+
$CMAKE_ARGS \
84
97
-DCMAKE_INSTALL_PREFIX=${{ steps.prep.outputs.prefix }} \
85
98
-DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF \
86
99
-DCMAKE_BUILD_TYPE=Release \
···
92
105
if: steps.cache.outputs.cache-hit != 'true' && contains(inputs.deps, 'zlib')
93
106
shell: bash
94
107
run: |
108
+
if [[ "$RUNNER_OS" == "Windows" ]]; then
109
+
export PATH="$(cygpath "$RUNNER_TEMP/msys64/clang64/bin"):$PATH"
110
+
fi
95
111
git clone --depth 1 --branch v${{ inputs.zlib_version }} https://github.com/madler/zlib.git /tmp/zlib
96
112
cd /tmp/zlib
97
113
CMAKE_GENERATOR="${{ inputs.cmake_generator }}"
···
99
115
export AR="${{ inputs.ar }}"
100
116
export RANLIB="${{ inputs.ranlib }}"
101
117
fi
102
-
CC=${{ inputs.cc }} cmake -B build \
118
+
CMAKE_ARGS="-DCMAKE_C_COMPILER=${{ inputs.cc }}"
119
+
if [[ "$RUNNER_OS" == "Windows" ]]; then
120
+
AR_PATH="$(which ${{ inputs.ar }})"
121
+
RANLIB_PATH="$(which ${{ inputs.ranlib }})"
122
+
CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_AR=$AR_PATH -DCMAKE_RANLIB=$RANLIB_PATH"
123
+
fi
124
+
if [[ -n "${{ inputs.cxx }}" ]]; then
125
+
CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_CXX_COMPILER=${{ inputs.cxx }}"
126
+
fi
127
+
cmake -B build \
103
128
${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"} \
129
+
$CMAKE_ARGS \
104
130
-DCMAKE_INSTALL_PREFIX=${{ steps.prep.outputs.prefix }} \
105
131
-DBUILD_SHARED_LIBS=OFF \
106
132
-DCMAKE_BUILD_TYPE=MinSizeRel
+4
-4
.github/actions/build-project/action.yml
+4
-4
.github/actions/build-project/action.yml
···
73
73
shell: bash
74
74
run: |
75
75
if [[ "$RUNNER_OS" == "Windows" ]]; then
76
-
MSYS2_PATH=$(cygpath "$RUNNER_TEMP/msys64/mingw64/bin")
76
+
MSYS2_PATH=$(cygpath "$RUNNER_TEMP/msys64/clang64/bin")
77
77
export PATH="$MSYS2_PATH:$PATH"
78
78
DEPS_PREFIX=$(cygpath -m "${{ inputs.deps_prefix }}")
79
79
export PKG_CONFIG_PATH="$DEPS_PREFIX/lib/pkgconfig;$PKG_CONFIG_PATH"
···
131
131
shell: bash
132
132
run: |
133
133
if [[ "$RUNNER_OS" == "Windows" ]]; then
134
-
MSYS2_PATH=$(cygpath "$RUNNER_TEMP/msys64/mingw64/bin")
134
+
MSYS2_PATH=$(cygpath "$RUNNER_TEMP/msys64/clang64/bin")
135
135
export PATH="$MSYS2_PATH:$PATH"
136
136
fi
137
137
VERSION=$(./build/${{ inputs.binary_name }} --version-raw)
···
142
142
shell: bash
143
143
run: |
144
144
if [[ "$RUNNER_OS" == "Windows" ]]; then
145
-
MSYS2_PATH=$(cygpath "$RUNNER_TEMP/msys64/mingw64/bin")
145
+
MSYS2_PATH=$(cygpath "$RUNNER_TEMP/msys64/clang64/bin")
146
146
export PATH="$MSYS2_PATH:$PATH"
147
147
fi
148
148
${{ inputs.strip }} build/${{ inputs.binary_name }}
···
151
151
if: runner.os == 'Windows'
152
152
shell: bash
153
153
run: |
154
-
MINGW_BIN=$(cygpath "$RUNNER_TEMP/msys64/mingw64/bin")
154
+
MINGW_BIN=$(cygpath "$RUNNER_TEMP/msys64/clang64/bin")
155
155
cp "$MINGW_BIN/libssl-3-x64.dll" build/
156
156
cp "$MINGW_BIN/libcrypto-3-x64.dll" build/
157
157
cp "$MINGW_BIN/libsodium-26.dll" build/
+6
-6
.github/actions/setup-llvm/action.yml
+6
-6
.github/actions/setup-llvm/action.yml
···
78
78
echo "ld=" >> $GITHUB_OUTPUT
79
79
;;
80
80
windows)
81
-
echo "cc=gcc" >> $GITHUB_OUTPUT
82
-
echo "cxx=g++" >> $GITHUB_OUTPUT
83
-
echo "ar=ar" >> $GITHUB_OUTPUT
84
-
echo "ranlib=ranlib" >> $GITHUB_OUTPUT
85
-
echo "strip=strip" >> $GITHUB_OUTPUT
86
-
echo "ld=" >> $GITHUB_OUTPUT
81
+
echo "cc=clang" >> $GITHUB_OUTPUT
82
+
echo "cxx=clang++" >> $GITHUB_OUTPUT
83
+
echo "ar=llvm-ar" >> $GITHUB_OUTPUT
84
+
echo "ranlib=llvm-ranlib" >> $GITHUB_OUTPUT
85
+
echo "strip=llvm-strip" >> $GITHUB_OUTPUT
86
+
echo "ld=lld" >> $GITHUB_OUTPUT
87
87
;;
88
88
esac
+1
-1
.github/versions.json
+1
-1
.github/versions.json
+4
-4
.github/workflows/build-platform.yml
+4
-4
.github/workflows/build-platform.yml
···
112
112
if: inputs.platform == 'windows-x64'
113
113
uses: msys2/setup-msys2@v2
114
114
with:
115
-
msystem: MINGW64
115
+
msystem: CLANG64
116
116
cache: true
117
117
install: >-
118
-
mingw-w64-x86_64-toolchain mingw-w64-x86_64-meson mingw-w64-x86_64-ninja
119
-
mingw-w64-x86_64-cmake mingw-w64-x86_64-openssl mingw-w64-x86_64-libsodium
120
-
mingw-w64-x86_64-lld mingw-w64-x86_64-nodejs git jq
118
+
mingw-w64-clang-x86_64-toolchain mingw-w64-clang-x86_64-meson mingw-w64-clang-x86_64-ninja
119
+
mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-openssl mingw-w64-clang-x86_64-libsodium
120
+
mingw-w64-clang-x86_64-lld mingw-w64-clang-x86_64-nodejs git jq
121
121
122
122
- name: Checkout
123
123
uses: actions/checkout@v4
-5
include/compat.h
-5
include/compat.h
+4
-4
include/progress.h
+4
-4
include/progress.h
···
142
142
if (SetConsoleMode(h, mode | ENABLE_VIRTUAL_TERMINAL_PROCESSING)) return true;
143
143
}
144
144
const char *term = getenv("TERM");
145
-
return term && strstr(term, "xterm")
146
-
|| term && strstr(term, "vt100")
147
-
|| term && strstr(term, "color")
148
-
|| term && strstr(term, "ansi");
145
+
return (term && strstr(term, "xterm"))
146
+
|| (term && strstr(term, "vt100"))
147
+
|| (term && strstr(term, "color"))
148
+
|| (term && strstr(term, "ansi"));
149
149
#else
150
150
const char *term = getenv("TERM");
151
151
if (!term) return false;
+1
vendor/packagefiles/libuv/cmake/libuv-config.cmake
+1
vendor/packagefiles/libuv/cmake/libuv-config.cmake
+24
vendor/packagefiles/patches/tlsuv-fix-fd-type.patch
+24
vendor/packagefiles/patches/tlsuv-fix-fd-type.patch
···
1
+
--- a/src/mbedtls/engine.c
2
+
+++ b/src/mbedtls/engine.c
3
+
@@ -111,7 +111,7 @@
4
+
tlsuv_engine_t new_mbedtls_engine(tls_context *ctx, const char *host);
5
+
6
+
static void mbedtls_set_io(tlsuv_engine_t, io_ctx , io_read , io_write );
7
+
-static void mbedtls_set_fd(tlsuv_engine_t, uv_os_fd_t );
8
+
+static void mbedtls_set_fd(tlsuv_engine_t, tlsuv_sock_t );
9
+
10
+
static tls_handshake_state mbedtls_hs_state(tlsuv_engine_t engine);
11
+
static tls_handshake_state
12
+
@@ -701,10 +701,10 @@
13
+
mbedtls_ssl_set_bio(eng->ssl, eng, engine_io_write, engine_io_read, NULL);
14
+
}
15
+
16
+
-static void mbedtls_set_fd(tlsuv_engine_t e, uv_os_fd_t fd) {
17
+
+static void mbedtls_set_fd(tlsuv_engine_t e, tlsuv_sock_t fd) {
18
+
struct mbedtls_engine *eng = (struct mbedtls_engine *) e;
19
+
assert(eng->io == NULL);
20
+
- eng->io_fd = fd;
21
+
+ eng->io_fd = (uv_os_fd_t)fd;
22
+
eng->io = &eng->io_fd;
23
+
mbedtls_ssl_set_bio(eng->ssl, eng->io, mbedtls_net_send, mbedtls_net_recv, NULL);
24
+
}
+1
vendor/tlsuv.wrap
+1
vendor/tlsuv.wrap