From 19496bcc01e1a3fd87c66542cbc84aa724690f8a Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Fri, 15 Sep 2017 13:06:21 +0200 Subject: [PATCH] Don't try to access /usr/local on Travis CI --- .travis.yml | 4 ++-- test/constcheck.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5e3bc42b..6f55c4d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,9 @@ compiler: before_script: - ./autogen.sh - - env CC=tcc CFLAGS='-w' ./configure --disable-dependency-tracking --disable-shared || cat config.log + - env CC=tcc CFLAGS='-w' ./configure --prefix=/tmp --disable-dependency-tracking --disable-shared || cat config.log - make -j $(nproc) && make check && make install - - ./test/constcheck.sh + - env CC=tcc CPPFLAGS='-I/tmp/include' LDFLAGS='-L/tmp/lib' LD_LIBRARY_PATH='/tmp/lib' ./test/constcheck.sh - make distclean script: diff --git a/test/constcheck.sh b/test/constcheck.sh index 6b2f1606..4681d358 100755 --- a/test/constcheck.sh +++ b/test/constcheck.sh @@ -13,7 +13,7 @@ for macro in $(egrep -r '#define crypto_.*BYTES(_[A-Z]+)? ' src/libsodium/includ done echo "return 0; }" >> "$CT" -cc "$CT" -lsodium || exit 1 +${CC:-cc} "$CT" $CPPFLAGS $CFLAGS $LDFLAGS -lsodium || exit 1 ./a.out || exit 1 rm -f a.out "$CT"