Skip to content

Commit d80c09d

Browse files
committed
try to forcibly remove RPATH linker option
revert wasi sdk to 20 remove temporary warning suppression
1 parent c5bd3b9 commit d80c09d

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ jobs:
360360

361361
linux-wasm-build:
362362
environment:
363-
WASI_SDK_VERSION: 22
363+
WASI_SDK_VERSION: 20
364364
machine:
365365
image: ubuntu-2204:2023.04.2
366366
steps:

cmake/toolchain/wasi.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ set(CMAKE_C_COMPILER /opt/wasi-sdk/bin/clang)
1818
set(CMAKE_CXX_COMPILER /opt/wasi-sdk/bin/clang++)
1919

2020
set(CMAKE_EXE_LINKER_FLAGS "-Xlinker -v -v")
21-
add_compile_options(-Wno-error=deprecated-declarations)
2221

2322
add_compile_definitions(CATCH_CONFIG_NO_POSIX_SIGNALS JSON_HAS_FILESYSTEM=0)
2423

cmd/test/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ else()
2828
target_compile_options(core_test PRIVATE -fno-exceptions)
2929
endif()
3030

31+
if(SILKWORM_WASM_API)
32+
# Strip off RPATH linker option added after building Catch2 v3.6.0 from sources
33+
get_target_property(CORE_TEST_LINK_OPTIONS core_test LINK_OPTIONS)
34+
list(REMOVE_ITEM CORE_TEST_LINK_OPTIONS "-rpath /home/circleci/.conan/data/catch2/3.6.0/_/_/package/9cc54baf4502227e8ffc50d3825f455b77620489/lib")
35+
set_target_properties(core_test PROPERTIES LINK_OPTIONS "${CORE_TEST_LINK_OPTIONS}")
36+
endif()
37+
3138
if(NOT SILKWORM_CORE_ONLY)
3239
# Enable fuzzing tests for Clang sanitizer builds only
3340
if("${CMAKE_CXX_COMPILER_ID}" MATCHES ".*Clang$" AND SILKWORM_FUZZER)

0 commit comments

Comments
 (0)