jjb: lttng-ust: Fix missing CPPFLAGS & LDFLAGS on configure for *dist build types

[lttng-ci.git] / scripts / lttng-ust / build.sh

diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh
index 80488e486d87f956247ce8f165c64317743469f0..5b9c39ebb42f2961e54b232303f5516691989c6d 100755 (executable)
--- a/scripts/lttng-ust/build.sh
+++ b/scripts/lttng-ust/build.sh
@@ -48,11 +48,13 @@ case "$arch" in
      ;;
 esac
 
-# Export build flags
-export CPPFLAGS="-I$URCU_INCS"
-export LDFLAGS="-L$URCU_LIBS"
+# Export time env. variables flags
 export LD_LIBRARY_PATH="$URCU_LIBS:${LD_LIBRARY_PATH:-}"
 
+# Define flags
+CPPFLAGS="-I$URCU_INCS"
+LDFLAGS="-L$URCU_LIBS"
+
 
 # Set configure options for each build configuration
 CONF_OPTS=""
@@ -72,6 +74,11 @@ agents)
     CONF_OPTS+=" --enable-python-agent"
     ;;
 
+debug-rcu)
+    echo "Enable RCU sanity checks for debugging"
+    CPPFLAGS="${CPPFLAGS:-} -DDEBUG_RCU"
+    ;;
+
 *)
     echo "Standard build"
     CONF_OPTS=""
@@ -102,14 +109,14 @@ oot)
     mkdir -p "$BUILD_PATH"
     cd "$BUILD_PATH"
 
-    "$SRCDIR/configure" --prefix="$PREFIX" $CONF_OPTS
+    CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" "$SRCDIR/configure" --prefix="$PREFIX" $CONF_OPTS
     ;;
 
 dist)
     echo "Distribution tarball in-tree build"
 
     # Initial configure and generate tarball
-    "$SRCDIR/configure"
+    CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" "$SRCDIR/configure"
     $MAKE dist
 
     BUILD_PATH="$(mktemp -d)"
@@ -120,7 +127,7 @@ dist)
     $TAR xvf ./*.tar.* --strip 1
 
     # Build in extracted source tree
-    "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
+    CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
     ;;
 
 oot-dist)
@@ -129,7 +136,7 @@ oot-dist)
     cd "$BUILD_PATH"
 
     # Initial configure and generate tarball
-    "$SRCDIR/configure"
+    CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" "$SRCDIR/configure"
     $MAKE dist
 
     NEWSRC_PATH="$(mktemp -d)"
@@ -143,12 +150,12 @@ oot-dist)
     cd "$BUILD_PATH"
 
     # Build oot from extracted sources
-    "$NEWSRC_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
+    CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" "$NEWSRC_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
     ;;
 
 *)
     echo "Standard in-tree build"
-    "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
+    CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
     ;;
 esac