Skip to content

Commit 0777fb6

Browse files
author
Alexander Korotkov
committed
Really build extension using specified compiler.
1 parent 36e85d8 commit 0777fb6

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Diff for: travis/pg-travis-test.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ ulimit -c unlimited -S
8989
echo '/tmp/%e-%s-%p.core' | sudo tee /proc/sys/kernel/core_pattern
9090

9191
# build extension (using CFLAGS_SL for gcov)
92-
if [ $CHECK_TYPE == "valgrind" ] && [ $CC = "clang" ]; then
92+
if [ $CHECK_TYPE == "valgrind" ]; then
9393
make USE_PGXS=1 USE_ASSERT_CHECKING=1 PG_CONFIG=$config_path
9494
make install USE_PGXS=1 PG_CONFIG=$config_path
9595
else
96-
make USE_PGXS=1 USE_ASSERT_CHECKING=1 PG_CONFIG=$config_path CFLAGS_SL="$($config_path --cflags_sl) -coverage"
96+
make USE_PGXS=1 USE_ASSERT_CHECKING=1 CC=$CC PG_CONFIG=$config_path CFLAGS_SL="$($config_path --cflags_sl) -coverage"
9797
sudo make install USE_PGXS=1 PG_CONFIG=$config_path
9898
fi
9999

@@ -144,7 +144,7 @@ for corefile in $(find /tmp/ -name '*.core' 2>/dev/null) ; do
144144
done
145145

146146
#generate *.gcov files
147-
if [ $CHECK_TYPE == "valgrind" ] && [ $CC = "clang" ]; then
147+
if [ $CC = "clang" ]; then
148148
bash <(curl -s https://codecov.io/bash) -x "llvm-cov gcov"
149149
else
150150
bash <(curl -s https://codecov.io/bash)

0 commit comments

Comments
 (0)