Skip to content

Commit d37f352

Browse files
committed
travis: fix make distcheck
bad side effect occurs when CPPFLAGS is set in the environment, so set it (and LDFLAGS too) on the configure command line. Signed-off-by: Gilles Gouaillardet <[email protected]>
1 parent ea7e1ea commit d37f352

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

.travis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ addons:
3939
env:
4040
global:
4141
- AM_MAKEFLAGS="-j4"
42-
- CPPFLAGS="-I$HOME/bogus/include"
43-
- LDFLAGS="-L$HOME/bogus/lib"
4442
- LD_LIBRARY_PATH="$HOME/bogus/lib"
4543
matrix:
4644
- GCC_VERSION=default
@@ -51,7 +49,7 @@ env:
5149
# well not build it.
5250
before_install:
5351
- if [[ "GCC_VERSION" == "6" ]]; then COMPILERS="CC=gcc-6 CXX=g++-6 FC=gfortran-6"; fi
54-
- export CONFIGURE_ARGS="--prefix=$HOME/bogus $COMPILERS" DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_ARGS"
52+
- export CONFIGURE_ARGS="--prefix=$HOME/bogus $COMPILERS CPPFLAGS=-I$HOME/bogus/include LDFLAGS=-L$HOME/bogus/lib" DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_ARGS"
5553
- export DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_ARGS"
5654
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git clone https://github.com/ofiwg/libfabric.git ; fi
5755
- if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$GCC_VERSION" == "6" ]] ; then sudo apt-get --assume-yes install gcc-6 g++-6 gfortran-6; fi

0 commit comments

Comments
 (0)