Skip to content
This repository was archived by the owner on Oct 15, 2020. It is now read-only.

Commit d3af30f

Browse files
obastemurchakrabot
authored andcommitted
deps: update ChakraCore to chakra-core/ChakraCore@9653b070f6
[1.8>1.9] [MERGE #4601 @obastemur] xplat: fix sanitizer builds Merge pull request #4601 from obastemur:fix_bash_san Reviewed-By: chakrabot <[email protected]>
1 parent 0fe6352 commit d3af30f

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

Diff for: deps/chakrashim/core/CMakeLists.txt

+12-7
Original file line numberDiff line numberDiff line change
@@ -353,13 +353,6 @@ if(CLR_CMAKE_PLATFORM_XPLAT)
353353
add_compile_options(-fno-rtti)
354354
endif()
355355
endif()
356-
357-
# Clang -fsanitize.
358-
if (CLANG_SANITIZE_SH)
359-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=${CLANG_SANITIZE_SH}")
360-
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -fsanitize=${CLANG_SANITIZE_SH}")
361-
unset(CLANG_SANITIZE_SH CACHE) # don't cache
362-
endif()
363356
endif(CLR_CMAKE_PLATFORM_XPLAT)
364357

365358
if (ENABLE_FULL_LTO_SH OR ENABLE_THIN_LTO_SH)
@@ -484,6 +477,18 @@ if(ICU_INCLUDE_PATH)
484477
endif()
485478
endif()
486479

480+
# detect features
481+
include_directories(SYSTEM /usr/local/include)
482+
include(pal/src/configure.cmake)
483+
484+
# this should be after `detect feature` to not to affect feature detection
485+
# Clang -fsanitize.
486+
if (CLANG_SANITIZE_SH)
487+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=${CLANG_SANITIZE_SH}")
488+
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -fsanitize=${CLANG_SANITIZE_SH}")
489+
unset(CLANG_SANITIZE_SH CACHE) # don't cache
490+
endif()
491+
487492
add_subdirectory (pal)
488493

489494
# build the rest with NO_PAL_MINMAX and PAL_STDCPP_COMPAT

Diff for: deps/chakrashim/core/pal/src/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
cmake_minimum_required(VERSION 3.2)
22

3-
include_directories(SYSTEM /usr/local/include)
4-
5-
include(configure.cmake)
6-
73
project(chakrapal)
84

95
set(CMAKE_INCLUDE_CURRENT_DIR ON)

Diff for: deps/chakrashim/core/pal/src/configure.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1041,4 +1041,4 @@ else() # ANDROID
10411041
set(ZH_TW_LOCALE_NAME zh_TW_LOCALE_NOT_FOUND)
10421042
set(HAS_FTRUNCATE_LENGTH_ISSUE 0)
10431043
endif()
1044-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
1044+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pal/src/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/pal/src/config.h)

0 commit comments

Comments
 (0)