projects
/
lttng-ci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jjb: liburcu: Handle debug-rcu conf value
[lttng-ci.git]
/
scripts
/
lttng-ust
/
build.sh
diff --git
a/scripts/lttng-ust/build.sh
b/scripts/lttng-ust/build.sh
index 80488e486d87f956247ce8f165c64317743469f0..dc44f21342bb04755541f3dcf3dcb4ac72b2aba0 100755
(executable)
--- a/
scripts/lttng-ust/build.sh
+++ b/
scripts/lttng-ust/build.sh
@@
-48,11
+48,13
@@
case "$arch" in
;;
esac
;;
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:-}"
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=""
# Set configure options for each build configuration
CONF_OPTS=""
@@
-102,7
+104,7
@@
oot)
mkdir -p "$BUILD_PATH"
cd "$BUILD_PATH"
mkdir -p "$BUILD_PATH"
cd "$BUILD_PATH"
- "$SRCDIR/configure" --prefix="$PREFIX" $CONF_OPTS
+
CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS"
"$SRCDIR/configure" --prefix="$PREFIX" $CONF_OPTS
;;
dist)
;;
dist)
@@
-120,7
+122,7
@@
dist)
$TAR xvf ./*.tar.* --strip 1
# Build in extracted source tree
$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)
;;
oot-dist)
@@
-143,12
+145,12
@@
oot-dist)
cd "$BUILD_PATH"
# Build oot from extracted sources
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"
;;
*)
echo "Standard in-tree build"
- "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
+
CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS"
"$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
;;
esac
;;
esac
This page took
0.023911 seconds
and
4
git commands to generate.