Skip to content

Commit 4624ce7

Browse files
authored
Merge pull request #4 from timeplus-io/test-cxx-standard
disable sanitizer in custom command
2 parents b858dd2 + 1127162 commit 4624ce7

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

CMakeLists_crosscompile.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ include(CheckPythonModuleExists)
2020

2121
check_python_module_exists(PYTHON_HAVE_MARKUPSAFE markupsafe)
2222

23-
# Stick to std c++17 for some code (std::unique_ptr to fwd-decl type) can not be compiled under c++23 after llvm upgrade
23+
# Stick to std c++20 for some code (std::unique_ptr to fwd-decl type) can not be compiled under c++23 after llvm upgrade
2424
# if (NOT CMAKE_CXX_STANDARD)
25-
set(CMAKE_CXX_STANDARD 17)
25+
set(CMAKE_CXX_STANDARD 20)
2626
# endif()
2727

2828
if (NOT CMAKE_C_STANDARD)
@@ -473,8 +473,10 @@ target_link_libraries(v8_snapshot
473473
)
474474

475475
# Note: allow passing in v8_random_seed
476+
# proton: disable sanitizer
476477
add_custom_command(
477478
COMMAND
479+
ASAN_OPTIONS=detect_container_overflow=0
478480
${CMAKE_CURRENT_SOURCE_DIR}/mksnapshot
479481
--embedded_src ${CMAKE_CURRENT_BINARY_DIR}/embedded.S
480482
--startup_src ${CMAKE_CURRENT_BINARY_DIR}/snapshot.cc

CMakeLists_default.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ include(CheckPythonModuleExists)
2020

2121
check_python_module_exists(PYTHON_HAVE_MARKUPSAFE markupsafe)
2222

23-
# Stick to std c++17 for some code (std::unique_ptr to fwd-decl type) can not be compiled under c++23 after llvm upgrade
23+
# Stick to std c++20 for some code (std::unique_ptr to fwd-decl type) can not be compiled under c++23 after llvm upgrade
2424
# if (NOT CMAKE_CXX_STANDARD)
25-
set(CMAKE_CXX_STANDARD 17)
25+
set(CMAKE_CXX_STANDARD 20)
2626
# endif()
2727

2828
if (NOT CMAKE_C_STANDARD)
@@ -474,8 +474,10 @@ target_link_libraries(v8_snapshot
474474

475475
# Note: allow passing in v8_random_seed
476476
# we use mksnapshot here
477+
# proton: disable sanitizer
477478
add_custom_command(
478479
COMMAND
480+
ASAN_OPTIONS=detect_container_overflow=0
479481
${CMAKE_CURRENT_BINARY_DIR}/mksnapshot
480482
--embedded_src ${CMAKE_CURRENT_BINARY_DIR}/embedded.S
481483
--startup_src ${CMAKE_CURRENT_BINARY_DIR}/snapshot.cc

0 commit comments

Comments
 (0)