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 <chakrabot@users.noreply.github.com>
nodejs · Jan 26, 2018 · d3af30f · d3af30f
1 parent 0fe6352
commit d3af30f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/deps/chakrashim/core/CMakeLists.txt b/deps/chakrashim/core/CMakeLists.txt
@@ -353,13 +353,6 @@ if(CLR_CMAKE_PLATFORM_XPLAT)
             add_compile_options(-fno-rtti)
         endif()
     endif()
-
-    # Clang -fsanitize.
-    if (CLANG_SANITIZE_SH)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=${CLANG_SANITIZE_SH}")
-        set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -fsanitize=${CLANG_SANITIZE_SH}")
-        unset(CLANG_SANITIZE_SH CACHE)      # don't cache
-    endif()
 endif(CLR_CMAKE_PLATFORM_XPLAT)
 
 if (ENABLE_FULL_LTO_SH OR ENABLE_THIN_LTO_SH)
@@ -484,6 +477,18 @@ if(ICU_INCLUDE_PATH)
     endif()
 endif()
 
+# detect features
+include_directories(SYSTEM /usr/local/include)
+include(pal/src/configure.cmake)
+
+# this should be after `detect feature` to not to affect feature detection
+# Clang -fsanitize.
+if (CLANG_SANITIZE_SH)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=${CLANG_SANITIZE_SH}")
+    set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -fsanitize=${CLANG_SANITIZE_SH}")
+    unset(CLANG_SANITIZE_SH CACHE)      # don't cache
+endif()
+
 add_subdirectory (pal)
 
 # build the rest with NO_PAL_MINMAX and PAL_STDCPP_COMPAT

diff --git a/deps/chakrashim/core/pal/src/CMakeLists.txt b/deps/chakrashim/core/pal/src/CMakeLists.txt
@@ -1,9 +1,5 @@
 cmake_minimum_required(VERSION 3.2)
 
-include_directories(SYSTEM /usr/local/include)
-
-include(configure.cmake)
-
 project(chakrapal)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)

diff --git a/deps/chakrashim/core/pal/src/configure.cmake b/deps/chakrashim/core/pal/src/configure.cmake
@@ -1041,4 +1041,4 @@ else() # ANDROID
   set(ZH_TW_LOCALE_NAME zh_TW_LOCALE_NOT_FOUND)
   set(HAS_FTRUNCATE_LENGTH_ISSUE 0)
 endif()
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pal/src/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/pal/src/config.h)