Merge branch 'master' of https://github.com/clostra/newnode

clostra · Jun 6, 2020 · 3369b77 · 3369b77
2 parents b51ffaf + ef220a6
commit 3369b77
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/build.android.sh b/build.android.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -euxo pipefail
 
 
 function build_android {
@@ -30,6 +30,7 @@ function build_android {
     LIBEVENT_CFLAGS=-ILibevent/$TRIPLE/include
     LIBEVENT="Libevent/$TRIPLE/lib/libevent.a Libevent/$TRIPLE/lib/libevent_pthreads.a"
 
+
     export ANDROID_NDK_HOME=$NDK
     cd libsodium
     test -f configure || ./autogen.sh
@@ -81,7 +82,7 @@ function build_android {
       -fno-rtti -fno-exceptions -fno-common -fno-inline -fno-optimize-sibling-calls -funwind-tables -fno-omit-frame-pointer -fstack-protector-all \
       -D__FAVOR_BSD -D_BSD_SOURCE -D_DEFAULT_SOURCE -DANDROID"
     #-fvisibility=hidden -fvisibility-inlines-hidden -flto \
-    if [ ! -z "$DEBUG" ]; then
+    if [ ! -z ${DEBUG+x} ]; then
         FLAGS="$FLAGS -O0 -DDEBUG=1"
     else
         FLAGS="$FLAGS -O0"

diff --git a/build.ios.sh b/build.ios.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -euxo pipefail
 
 
 function build_ios {
@@ -46,7 +46,7 @@ function build_ios {
       -fno-rtti -fno-exceptions -fno-common -fno-inline -fno-optimize-sibling-calls -funwind-tables -fno-omit-frame-pointer -fstack-protector-all \
       -fvisibility-inlines-hidden \
       -I."
-    if [ ! -z "$DEBUG" ]; then
+    if [ ! -z ${DEBUG+x} ]; then
         FLAGS="$FLAGS -DDEBUG=1"
     fi
 

diff --git a/build.sh b/build.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
-set -e
+set -euxo pipefail
+
 
 export CC=clang
 export CXX=clang++
@@ -56,7 +57,7 @@ FLAGS="-g -Werror -Wall -Wextra -Wno-deprecated-declarations -Wno-unused-paramet
   -fno-rtti -fno-exceptions -fno-common -fno-inline -fno-optimize-sibling-calls -funwind-tables -fno-omit-frame-pointer -fstack-protector-all \
   -D__FAVOR_BSD -D_BSD_SOURCE -D_DEFAULT_SOURCE"
 # -fvisibility=hidden -fvisibility-inlines-hidden -flto=thin \
-if [ ! -z "$DEBUG" ]; then
+if [ ! -z ${DEBUG+x} ]; then
     FLAGS="$FLAGS -O0 -DDEBUG=1 -fsanitize=address -fsanitize=undefined --coverage"
 else
     FLAGS="$FLAGS -O0 -fsanitize=address -fsanitize=undefined"