From ab89ec9840fbd976fa2c27966704f4875017d037 Mon Sep 17 00:00:00 2001
From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Mon, 23 Jan 2017 17:50:09 -0500
Subject: [PATCH] jjb: Do not export CPPFLAGS and LDFLAGS

Pass CPPFLAGS and LDFLAGS to configure.

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
---
 scripts/lttng-ust/build.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh
index 80488e4..dc44f21 100755
--- 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=""
@@ -102,7 +104,7 @@ 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)
@@ -120,7 +122,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)
@@ -143,12 +145,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
 
-- 
2.34.1