jjb: Add env vars for CSW on Solaris 11

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

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index 920c65960b5dd051ab8c667cbb65741b91514f9f..68b675ca2d32997c901367f86ebcd9f40ef160af 100755 (executable)
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -106,6 +106,8 @@ sol11-i386)
     export BISON="/opt/csw/bin/bison"
     export YACC="$BISON -y"
     export PATH="$PATH:/usr/perl5/bin"
+    export CPPFLAGS="-I/opt/csw/include"
+    export LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib"
     export LD_ALTEXEC=/usr/sfw/bin/gld
     export LD=/usr/sfw/bin/gld
     ;;

diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index bd164a20c680871166fbfeed164fa1f498fe370f..d20522dfb2577c21c96205ec9f87654fddb7feef 100755 (executable)
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -110,7 +110,7 @@ sol10-i386)
     NPROC=gnproc
     BISON="bison"
     YACC="$BISON -y"
-    CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500"
+    CFLAGS="${CFLAGS:-} -D_XOPEN_SOURCE=500"
     RUN_TESTS="no"
 
     export PATH="/opt/csw/bin:/usr/ccs/bin:$PATH"
@@ -122,11 +122,11 @@ sol11-i386)
     NPROC=nproc
     BISON="/opt/csw/bin/bison"
     YACC="$BISON -y"
-    CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500"
+    CFLAGS="${CFLAGS:-} -D_XOPEN_SOURCE=500"
     RUN_TESTS="no"
 
     export PATH="$PATH:/usr/perl5/bin"
-    CFLAGS="$CFLAGS -I/opt/csw/include"
+    CPPFLAGS="-I/opt/csw/include"
     LDFLAGS="-L/opt/csw/lib"
     ;;
 
@@ -139,7 +139,7 @@ macosx)
     RUN_TESTS="no"
 
     export PATH="/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
-    CFLAGS="$CFLAGS -I/opt/local/include"
+    CPPFLAGS="-I/opt/local/include"
     LDFLAGS="-L/opt/local/lib"
     ;;