widelands-dev team mailing list archive

[kaputtnik <somal@xxxxxxxx>]

kaputtnik has proposed merging lp:~widelands-dev/widelands/bug-1776007_make_asan_explicit into lp:widelands.

Commit message:
Make the use of ASAN optional in the compile.sh script

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1776007 in widelands: "Remove ASAN option from compile.sh"
  https://bugs.launchpad.net/widelands/+bug/1776007

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1776007_make_asan_explicit/+merge/347840

Make the use of ASAN optional in the compile.sh script.

So the script will make a debug build without asan per default.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1776007_make_asan_explicit into lp:widelands.

=== modified file 'compile.sh'
--- compile.sh	2017-11-30 07:04:11 +0000
+++ compile.sh	2018-06-12 19:37:31 +0000
@@ -38,7 +38,7 @@
     echo "-t or --no-translations"
     echo "                      Omit building translations."
     echo " "
-    echo "-a or --no-asan       If in debug mode, switch off the AddressSanitizer."
+    echo "-a or --asan          Switch on the AddressSanitizer."
     echo "                      Release builds are created without AddressSanitizer"
     echo "                      per default."
     echo " "
@@ -75,7 +75,7 @@
 BUILD_WEBSITE="ON"
 BUILD_TRANSLATIONS="ON"
 BUILD_TYPE="Debug"
-USE_ASAN="ON"
+USE_ASAN="OFF"
 COMPILER="default"
 while [ "$1" != "" ]; do
   if [ "$1" = "--no-website" -o "$1" = "-w" ]; then
@@ -85,8 +85,8 @@
     USE_ASAN="OFF"
   elif [ "$1" = "--no-translations" -o "$1" = "-t" ]; then
     BUILD_TRANSLATIONS="OFF"
-  elif [ "$1" = "--no-asan" -o "$1" = "-a" ]; then
-    USE_ASAN="OFF"
+  elif [ "$1" = "--asan" -o "$1" = "-a" ]; then
+    USE_ASAN="ON"
   elif [ "$1" = "--gcc" ]; then
     if [ -f /usr/bin/gcc -a /usr/bin/g++ ]; then
       export CC=/usr/bin/gcc
@@ -132,7 +132,6 @@
 if [ $USE_ASAN = "ON" ]; then
   echo "Will build with AddressSanitizer."
   echo "http://clang.llvm.org/docs/AddressSanitizer.html";
-  echo "You can use -a or --no-asan to switch it off."
 else
   echo "Will build without AddressSanitizer."
 fi