@@ -59,29 +59,46 @@ void prepare() {
5959
6060void build_lsquic (const char * arch ) {
6161#ifndef IS_WINDOWS
62- /* Build for x64 or arm/arm64 (depending on the host) */
63- run ("cd uWebSockets/uSockets/lsquic && cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBORINGSSL_DIR=../boringssl -DCMAKE_BUILD_TYPE=Release -DLSQUIC_BIN=Off . && make lsquic" );
62+ /* Build for arm64 and x64 for macOS */
63+
64+ #ifdef IS_MACOS
65+ if (arch == X64 ) {
66+ run ("cd uWebSockets/uSockets/lsquic && mkdir -p arm64 && cd arm64 && cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_OSX_ARCHITECTURES=arm64 -DBORINGSSL_DIR=../boringssl -DCMAKE_BUILD_TYPE=Release -DLSQUIC_BIN=Off .. && make lsquic" );
67+ } else if (arch == ARM64 ) {
68+ run ("cd uWebSockets/uSockets/lsquic && mkdir -p x64 && cd x64 && cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_OSX_ARCHITECTURES=x86_64 -DBORINGSSL_DIR=../boringssl -DCMAKE_BUILD_TYPE=Release -DLSQUIC_BIN=Off .. && make lsquic" );
69+ }
70+ #else
71+ /* Linux */
72+
73+
74+ #endif
75+
76+
77+
6478#else
79+ /* Windows */
80+
6581 /* Download zlib */
6682 run ("curl -OL https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz" );
6783 run ("tar xzf zlib-1.3.1.tar.gz" );
6884
6985 // can this work for arm64
70- run ("cd uWebSockets/uSockets/lsquic && mkdir -p arm64 && cmake -DCMAKE_C_FLAGS=\"/DWIN32 /I..\\..\\..\\..\\zlib-1.3.1\" -DZLIB_INCLUDE_DIR=..\\..\\..\\..\\zlib-1.3.1 -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_OSX_ARCHITECTURES=arm64 -DBORINGSSL_DIR=../../boringssl -DCMAKE_BUILD_TYPE=Release -DLSQUIC_BIN=Off . && msbuild ALL_BUILD.vcxproj" );
86+ run ("cd uWebSockets/uSockets/lsquic && mkdir -p arm64 && cd arm64 && cmake -DCMAKE_C_FLAGS=\"/DWIN32 /I..\\..\\..\\..\\zlib-1.3.1\" -DZLIB_INCLUDE_DIR=..\\..\\..\\..\\zlib-1.3.1 -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_OSX_ARCHITECTURES=arm64 -DBORINGSSL_DIR=../../boringssl -DCMAKE_BUILD_TYPE=Release -DLSQUIC_BIN=Off . && msbuild ALL_BUILD.vcxproj" );
7187
72- run ("cd uWebSockets/uSockets/lsquic && mkdir -p x64 && cmake -DCMAKE_C_FLAGS=\"/DWIN32 /I..\\..\\..\\..\\zlib-1.3.1\" -DZLIB_INCLUDE_DIR=..\\..\\..\\..\\zlib-1.3.1 -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_OSX_ARCHITECTURES=x64 -DBORINGSSL_DIR=../../boringssl -DCMAKE_BUILD_TYPE=Release -DLSQUIC_BIN=Off . && msbuild ALL_BUILD.vcxproj" );
88+ run ("cd uWebSockets/uSockets/lsquic && mkdir -p x64 && cd x64 && cmake -DCMAKE_C_FLAGS=\"/DWIN32 /I..\\..\\..\\..\\zlib-1.3.1\" -DZLIB_INCLUDE_DIR=..\\..\\..\\..\\zlib-1.3.1 -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_OSX_ARCHITECTURES=x64 -DBORINGSSL_DIR=../../boringssl -DCMAKE_BUILD_TYPE=Release -DLSQUIC_BIN=Off . && msbuild ALL_BUILD.vcxproj" );
7389#endif
7490}
7591
7692/* Build boringssl */
7793void build_boringssl (const char * arch ) {
7894
7995#ifdef IS_MACOS
80- /* Build for x64 (the host) */
81- run ("cd uWebSockets/uSockets/boringssl && mkdir -p x64 && cd x64 && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=x86_64 .. && make crypto ssl" );
82-
83- /* Build for arm64 (cross compile) */
84- run ("cd uWebSockets/uSockets/boringssl && mkdir -p arm64 && cd arm64 && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64 .. && make crypto ssl" );
96+ /* Only macOS uses cross-compilation */
97+ if (arch == X64 ) {
98+ run ("cd uWebSockets/uSockets/boringssl && mkdir -p x64 && cd x64 && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=x86_64 .. && make crypto ssl" );
99+ } else if (arch == ARM64 ) {
100+ run ("cd uWebSockets/uSockets/boringssl && mkdir -p arm64 && cd arm64 && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64 .. && make crypto ssl" );
101+ }
85102#endif
86103
87104#ifdef IS_LINUX
@@ -141,10 +158,19 @@ int main() {
141158#ifdef __aarch64__
142159 arch = ARM64 ;
143160#endif
144- /* Build for x64 and/or arm/arm64 */
145- build_boringssl (arch );
146161
162+ #ifdef IS_MACOS
163+ /* If we are macOS, build both arm64 and x64 */
164+ build_boringssl (X64 );
165+ build_boringssl (ARM64 );
166+ build_lsquic (X64 );
167+ build_lsquic (ARM64 );
168+ #else
169+ /* For other platforms we simply compile the host */
170+ build_boringssl (arch );
147171 build_lsquic (arch );
172+ #endif
173+
148174
149175#ifdef IS_WINDOWS
150176 /* We can use clang, but we currently do use cl.exe still */
0 commit comments