Skip to content

Commit c309f74

Browse files
committed
Revert "Revert "TMP: Debug Binaryen on macos with ASan""
This reverts commit 5b0f7a6.
1 parent 5b0f7a6 commit c309f74

File tree

2 files changed

+3
-20
lines changed

2 files changed

+3
-20
lines changed

circle.yml

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ defaults:
136136
name: "Test shared Hera (binaryen)"
137137
command: |
138138
SO=$([ $(uname) = Darwin ] && echo dylib || echo so)
139-
if [[ $PRELOAD_ASAN ]]; then export LD_PRELOAD=/usr/lib/clang/6.0/lib/linux/libclang_rt.asan-x86_64.so; fi
139+
export DYLD_INSERT_LIBRARIES=/Applications/Xcode-10.1.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/10.0.0/lib/darwin/libclang_rt.asan_osx_dynamic.dylib
140140
testeth --version
141141
testeth -t GeneralStateTests/stEWASMTests -- --testpath tests --vm ~/build/src/libhera.$SO --singlenet Byzantium --evmc engine=binaryen
142142
@@ -291,7 +291,7 @@ jobs:
291291
- CXX: c++
292292
- GENERATOR: Unix Makefiles
293293
- BUILD_PARALLEL_JOBS: 4
294-
- CMAKE_OPTIONS: -DHERA_DEBUGGING=ON -DHERA_WABT=ON
294+
- CMAKE_OPTIONS: -DHERA_DEBUGGING=ON -DHERA_WABT=ON -DSANITIZE=address
295295
macos:
296296
xcode: "10.1.0"
297297
steps:
@@ -346,24 +346,7 @@ workflows:
346346
version: 2
347347
hera:
348348
jobs:
349-
- lint
350-
- linux-clang-shared-asan
351-
- linux-gcc-shared-coverage
352-
- linux-gcc-static-debug
353-
- linux-clang-shared-release:
354-
filters:
355-
tags:
356-
only: /.*/
357349
- macos:
358350
filters:
359351
tags:
360352
only: /.*/
361-
- deploy:
362-
requires:
363-
- linux-clang-shared-release
364-
- macos
365-
filters:
366-
branches:
367-
ignore: /.*/
368-
tags:
369-
only: /^v[0-9].*/

cmake/ProjectBinaryen.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ ExternalProject_Add(binaryen
5252
CMAKE_ARGS
5353
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
5454
-DCMAKE_INSTALL_LIBDIR=lib
55-
-DCMAKE_BUILD_TYPE=Release
55+
-DCMAKE_BUILD_TYPE=Debug
5656
-DBUILD_STATIC_LIB=ON
5757
-DCMAKE_CXX_FLAGS=${binaryen_cxx_flags}
5858
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}

0 commit comments

Comments
 (0)