Skip to content

Commit 9e11aba

Browse files
committed
Will this ever end
1 parent 99756fd commit 9e11aba

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Emscripten")
124124
endif()
125125

126126
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
127+
message(STATUS "aarch64 detected; disabling stack protector")
127128
# GMP seems to need this
128129
string(APPEND LEAN_EXTRA_CXX_FLAGS " -fno-stack-protector")
129130
endif()
@@ -255,7 +256,7 @@ if("${CMAKE_SYSTEM_NAME}" MATCHES "Emscripten")
255256
PREFIX libuv
256257
GIT_REPOSITORY https://github.com/libuv/libuv
257258
GIT_TAG v1.48.0
258-
CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DLIBUV_BUILD_TESTS=OFF -DLIBUV_BUILD_SHARED=OFF -DCMAKE_AR=${CMAKE_SOURCE_DIR}/../emsdk/emsdk-main/upstream/emscripten/emar -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/../emsdk/emsdk-main/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_FLAGS=${EMSCRIPTEN_SETTINGS}
259+
CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DLIBUV_BUILD_TESTS=OFF -DLIBUV_BUILD_SHARED=OFF -DCMAKE_AR=${CMAKE_SOURCE_DIR}/../emsdk/emsdk-main/upstream/emscripten/emar -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/../emsdk/emsdk-main/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_FLAGS="${EMSCRIPTEN_SETTINGS}"
259260
BUILD_IN_SOURCE ON
260261
INSTALL_COMMAND "")
261262
set(LIBUV_INCLUDE_DIR "${CMAKE_BINARY_DIR}/libuv/src/libuv/include")

0 commit comments

Comments
 (0)