From a717a532a05ff76618411ef3c86bb0ada4057494 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 13 Nov 2017 15:33:40 -0500 Subject: [PATCH] jjb: Add env vars for CSW on Solaris 11 Signed-off-by: Michael Jeanson --- scripts/babeltrace/build.sh | 2 ++ scripts/lttng-tools/build.sh | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh index 920c659..68b675c 100755 --- 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 bd164a2..d20522d 100755 --- 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" ;; -- 2.34.1