Skip to content

Commit 8ba3527

Browse files
committed
Bump to emscripten_version 5.0.3
1 parent 802102a commit 8ba3527

2 files changed

Lines changed: 1 addition & 6 deletions

File tree

‎ci/docker/ubuntu-22.04-cpp.dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ RUN apt-get update -y -q && \
130130
rm -rf /var/lib/apt/lists*
131131

132132
# install emscripten using EMSDK
133-
ARG emscripten_version="3.1.45"
133+
ARG emscripten_version="5.0.3"
134134
RUN cd ~ && git clone https://github.com/emscripten-core/emsdk.git && \
135135
cd emsdk && \
136136
./emsdk install ${emscripten_version} && \

‎cpp/cmake_modules/SetupCxxFlags.cmake‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -747,11 +747,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
747747
"${ARROW_EMSCRIPTEN_LINKER_FLAGS} -sERROR_ON_WASM_CHANGES_AFTER_LINK=1 -sSTACK_SIZE=${ARROW_EMSCRIPTEN_TEST_STACK_SIZE} -sALLOW_MEMORY_GROWTH -lnodefs.js -lnoderawfs.js --pre-js ${BUILD_SUPPORT_DIR}/emscripten-test-init.js"
748748
)
749749
endif()
750-
# Abseil stack trace via emscripten_stack_snapshot() abort on Emscripten<4.0.14
751-
# if offset converter isn't enabled. Emscripten 4.0.14 removed the offset converter
752-
if(EMSCRIPTEN_VERSION VERSION_LESS "4.0.14")
753-
string(APPEND CMAKE_EXE_LINKER_FLAGS " -sUSE_OFFSET_CONVERTER=1")
754-
endif()
755750
else()
756751
set(CMAKE_EXE_LINKER_FLAGS "${ARROW_EMSCRIPTEN_LINKER_FLAGS} -sALLOW_MEMORY_GROWTH")
757752
endif()

0 commit comments

Comments
 (0)