jjb: make sure we build with O2 on all platforms

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index 6bc76c3a06590ca07fc865952ea94dca5458d32c..680d4d2221adff495d8ffc3182cd7051929c4c2d 100755 (executable)
--- 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 76c0c614972bad01963f438b1498b5c36c55c53b..e731e19b4647b183d93916ebf22e3f59282d6431 100755 (executable)
--- 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 de11e5c8d4b041ebafef930198983292d5dfc41c..6cfe88cc0c1d1ad40ac73fc36b258f06df84a977 100755 (executable)
--- 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 5b9c39ebb42f2961e54b232303f5516691989c6d..883154ebdaf824b3656b1f0078159d84141fe253 100755 (executable)
--- 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