From 72d087d4fb338e11a3129ff1d6629af6acc6d00b Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 22 Aug 2017 16:27:56 -0400
Subject: [PATCH] jjb: make sure we build with O2 on all platforms

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
 scripts/babeltrace/build.sh  |  3 ++-
 scripts/liburcu/build.sh     |  5 +++--
 scripts/lttng-tools/build.sh | 11 ++++++-----
 scripts/lttng-ust/build.sh   |  1 +
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index 6bc76c3..680d4d2 100755
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -84,6 +84,7 @@ rm -rf "$PREFIX" "$TMPDIR"
 mkdir -p "$PREFIX" "$TMPDIR"
 
 export TMPDIR
+export CFLAGS="-g -O2"
 
 # Set platform variables
 case "$arch" in
@@ -115,7 +116,7 @@ macosx)
     export BISON="bison"
     export YACC="$BISON -y"
     export PATH="/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
-    export CFLAGS="-I/opt/local/include"
+    export CFLAGS="$CFLAGS -I/opt/local/include"
     export LDFLAGS="-L/opt/local/lib"
     ;;
 *)
diff --git a/scripts/liburcu/build.sh b/scripts/liburcu/build.sh
index 76c0c61..e731e19 100755
--- a/scripts/liburcu/build.sh
+++ b/scripts/liburcu/build.sh
@@ -84,6 +84,7 @@ rm -rf "$PREFIX" "$TMPDIR"
 mkdir -p "$PREFIX" "$TMPDIR"
 
 export TMPDIR
+export CFLAGS="-g -O2"
 
 # Set platform variables
 case "$arch" in
@@ -115,7 +116,7 @@ macosx)
     export BISON="bison"
     export YACC="$BISON -y"
     export LDFLAGS="-L/opt/local/lib"
-    export CFLAGS="-I/opt/local/include"
+    export CFLAGS="$CFLAGS -I/opt/local/include"
     export PATH="/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
     ;;
 
@@ -154,7 +155,7 @@ debug-rcu)
     if vergte "$PACKAGE_VERSION" "0.10"; then
        CONF_OPTS="--enable-rcu-debug"
     else
-       export CFLAGS="${CFLAGS:} -DDEBUG_RCU"
+       export CFLAGS="$CFLAGS -DDEBUG_RCU"
     fi
     ;;
 
diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index de11e5c..6cfe88c 100755
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -85,6 +85,7 @@ rm -rf "$PREFIX" "$TAPDIR"
 mkdir -p "$PREFIX" "$TAPDIR"
 
 #export TMPDIR
+CFLAGS="-g -O2"
 
 # liburcu
 URCU_INCS="$WORKSPACE/deps/liburcu/build/include/"
@@ -109,7 +110,7 @@ sol10-i386)
     NPROC=gnproc
     BISON="bison"
     YACC="$BISON -y"
-    CFLAGS="-D_XOPEN_SOURCE=500"
+    CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500"
     RUN_TESTS="no"
 
     export PATH="/opt/csw/bin:/usr/ccs/bin:$PATH"
@@ -121,7 +122,7 @@ sol11-i386)
     NPROC=nproc
     BISON="/opt/csw/bin/bison"
     YACC="$BISON -y"
-    CFLAGS="-D_XOPEN_SOURCE=500"
+    CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500"
     RUN_TESTS="no"
 
     export PATH="$PATH:/usr/perl5/bin"
@@ -136,7 +137,7 @@ macosx)
     RUN_TESTS="no"
 
     export PATH="/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
-    CFLAGS="-I/opt/local/include"
+    CFLAGS="$CFLAGS -I/opt/local/include"
     LDFLAGS="-L/opt/local/lib"
     ;;
 
@@ -146,7 +147,7 @@ cygwin|cygwin64|msys32|msys64)
     NPROC=nproc
     BISON="bison"
     YACC="$BISON -y"
-    CFLAGS=""
+    #CFLAGS=""
     RUN_TESTS="no"
     ;;
 
@@ -156,7 +157,7 @@ cygwin|cygwin64|msys32|msys64)
     NPROC=nproc
     BISON="bison"
     YACC="$BISON -y"
-    CFLAGS=""
+    #CFLAGS=""
     RUN_TESTS="yes"
 
     PYTHON2=python2
diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh
index 5b9c39e..883154e 100755
--- a/scripts/lttng-ust/build.sh
+++ b/scripts/lttng-ust/build.sh
@@ -35,6 +35,7 @@ rm -rf "$PREFIX" "$TMPDIR"
 mkdir -p "$PREFIX" "$TMPDIR"
 
 export TMPDIR
+export CFLAGS="-g -O2"
 
 # Set platform variables
 case "$arch" in
-- 
2.34.1