From: Haesik, Jun Date: Tue, 13 Feb 2018 04:29:32 +0000 (+0900) Subject: Disable static linking option to support ASAN X-Git-Tag: submit/tizen/20180213.043730^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b77130746d315f15682926659a94df861ee67829;p=platform%2Fupstream%2Fiotjs.git Disable static linking option to support ASAN Change-Id: I8908ac9a8aacbfa189f6b4ab65cf9c12d3cc22a8 Signed-off-by: Haesik, Jun --- diff --git a/cmake/jerry.cmake b/cmake/jerry.cmake index 4340a01..4ade9ea 100644 --- a/cmake/jerry.cmake +++ b/cmake/jerry.cmake @@ -32,6 +32,7 @@ ExternalProject_Add(hostjerry -DJERRY_EXT=OFF -DFEATURE_SNAPSHOT_SAVE=${ENABLE_SNAPSHOT} -DFEATURE_PROFILE=${FEATURE_PROFILE} + ${EXTRA_JERRY_CMAKE_PARAMS} ) set(JERRY_HOST_SNAPSHOT ${CMAKE_BINARY_DIR}/${DEPS_HOST_JERRY}/bin/jerry-snapshot) diff --git a/config/tizen/packaging/iotjs.spec b/config/tizen/packaging/iotjs.spec index a38cf92..1f8be93 100644 --- a/config/tizen/packaging/iotjs.spec +++ b/config/tizen/packaging/iotjs.spec @@ -76,6 +76,7 @@ cp %{SOURCE1001} . --compile-flag=-D__TIZEN__ \ --cmake-param=-DENABLE_MODULE_DGRAM=ON \ --cmake-param=-DENABLE_MODULE_GPIO=ON \ + --jerry-cmake-param=-DENABLE_STATIC_LINK=OFF \ --no-init-submodule --no-parallel-build # --external-lib=sdkapi \ diff --git a/deps/jerry/CMakeLists.txt b/deps/jerry/CMakeLists.txt index bab2612..2a4b22b 100644 --- a/deps/jerry/CMakeLists.txt +++ b/deps/jerry/CMakeLists.txt @@ -51,7 +51,9 @@ set(DOCTESTS OFF CACHE BOOL "Build doc tests?") # Optional build settings set(ENABLE_ALL_IN_ONE OFF CACHE BOOL "Enable all-in-one build?") set(ENABLE_LTO ON CACHE BOOL "Enable LTO build?") -set(ENABLE_STATIC_LINK ON CACHE BOOL "Enable static linking?") +if(NOT DEFINED ENABLE_STATIC_LINK) + set(ENABLE_STATIC_LINK ON CACHE BOOL "Enable static linking?") +endif() set(ENABLE_STRIP ON CACHE BOOL "Enable stripping all symbols from release binary?") # Optional features