[nifi-minifi-cpp] branch main updated: MINIFICPP-1496 Remove ASAN from the list of extensions in bootstrap.sh

[adebreceni]

This is an automated email from the ASF dual-hosted git repository.

adebreceni pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git


The following commit(s) were added to refs/heads/main by this push:
     new 287f184  MINIFICPP-1496 Remove ASAN from the list of extensions in 
bootstrap.sh
287f184 is described below

commit 287f1840740c15e535ccc8f9c1cdc149938f639d
Author: Ferenc Gerlits <fgerl...@gmail.com>
AuthorDate: Mon Mar 8 09:12:02 2021 +0100

    MINIFICPP-1496 Remove ASAN from the list of extensions in bootstrap.sh
    
    Signed-off-by: Adam Debreceni <adebrec...@apache.org>
    
    This closes #1005
---
 bootstrap.sh       | 10 ++++++++--
 bstrp_functions.sh |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index ed4a9d5..125ee9d 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -324,12 +324,11 @@ add_dependency OPC_ENABLED "mbedtls"
 
 USE_SHARED_LIBS=${TRUE}
 TESTS_DISABLED=${FALSE}
+ASAN_ENABLED=${FALSE}
 
 ## name, default, values
 add_multi_option BUILD_PROFILE "RelWithDebInfo" "RelWithDebInfo" "Debug" 
"MinSizeRel" "Release"
 
-add_disabled_option ASAN_ENABLED ${FALSE} "ASAN_BUILD"
-
 if [ "$GUIDED_INSTALL" == "${TRUE}" ]; then
   EnableAllFeatures
   ALL_FEATURES_ENABLED=${TRUE}
@@ -450,6 +449,7 @@ build_cmake_command(){
       fi
     fi
   done
+
   if [ "${DEBUG_SYMBOLS}" = "${TRUE}" ]; then
     CMAKE_BUILD_COMMAND="${CMAKE_BUILD_COMMAND} 
-DCMAKE_BUILD_TYPE=RelWithDebInfo"
   fi
@@ -460,6 +460,12 @@ build_cmake_command(){
     # user may have disabled tests previously, so let's force them to be 
re-enabled
     CMAKE_BUILD_COMMAND="${CMAKE_BUILD_COMMAND} -DSKIP_TESTS= "
   fi
+
+  if [ "${ASAN_ENABLED}" = "${TRUE}" ]; then
+    CMAKE_BUILD_COMMAND="${CMAKE_BUILD_COMMAND} -DASAN_BUILD=ON "
+  else
+    CMAKE_BUILD_COMMAND="${CMAKE_BUILD_COMMAND} -DASAN_BUILD=OFF"
+  fi
   
   if [ "${USE_SHARED_LIBS}" = "${TRUE}" ]; then
     CMAKE_BUILD_COMMAND="${CMAKE_BUILD_COMMAND} -DUSE_SHARED_LIBS=ON "
diff --git a/bstrp_functions.sh b/bstrp_functions.sh
index 4ec336c..a75b9f3 100755
--- a/bstrp_functions.sh
+++ b/bstrp_functions.sh
@@ -169,6 +169,7 @@ save_state(){
   echo_state_variable TESTS_DISABLED
   echo_state_variable BUILD_PROFILE
   echo_state_variable USE_SHARED_LIBS
+  echo_state_variable ASAN_ENABLED
   for option in "${OPTIONS[@]}" ; do
     echo_state_variable $option
   done