From 8a4d057c3d1c4f31aece3cdae212d6c7acdd6c0b Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Mon, 23 Jan 2017 16:22:31 -0500 Subject: [PATCH] jjb: Do not export LDFLAGS and CFLAGS Pass LDFLAGS to configure. Signed-off-by: Jonathan Rajotte --- scripts/liburcu/build.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/scripts/liburcu/build.sh b/scripts/liburcu/build.sh index 796f4aa..dfd1040 100755 --- a/scripts/liburcu/build.sh +++ b/scripts/liburcu/build.sh @@ -91,6 +91,7 @@ solaris10) MAKE=gmake TAR=gtar NPROC=gnproc + LDFLAGS="" CFLAGS="-D_XOPEN_SOURCE=1 -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__=1" ;; @@ -98,6 +99,7 @@ solaris11) MAKE=gmake TAR=gtar NPROC=nproc + LDFLAGS="" CFLAGS="-D_XOPEN_SOURCE=1 -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__=1" export PATH="$PATH:/usr/perl5/bin" ;; @@ -108,15 +110,16 @@ macosx) NPROC="getconf _NPROCESSORS_ONLN" BISON="bison" YACC="$BISON -y" + LDFLAGS="-L/opt/local/lib" + CFLAGS="-I/opt/local/include" export PATH="/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" - export CFLAGS="-I/opt/local/include" - export LDFLAGS="-L/opt/local/lib" ;; *) MAKE=make TAR=tar NPROC=nproc + LDFLAGS="" CFLAGS="" ;; esac @@ -165,7 +168,7 @@ oot) BUILD_PATH=$WORKSPACE/oot mkdir -p "$BUILD_PATH" cd "$BUILD_PATH" - MAKE=$MAKE CFLAGS="$CFLAGS" "$SRCDIR/configure" --prefix="$PREFIX" $CONF_OPTS + MAKE=$MAKE CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" "$SRCDIR/configure" --prefix="$PREFIX" $CONF_OPTS ;; dist) @@ -183,11 +186,11 @@ dist) # Ignore level 1 of tar $TAR xvf ./*.tar.* --strip 1 - MAKE=$MAKE CFLAGS="$CFLAGS" "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS + MAKE=$MAKE CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS ;; *) echo "Standard in-tree build" - MAKE=$MAKE CFLAGS="$CFLAGS" "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS + MAKE=$MAKE CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS ;; esac -- 2.34.1