summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernd Edlinger <bernd.edlinger@hotmail.de>2018-05-26 17:08:03 +0200
committerBernd Edlinger <bernd.edlinger@hotmail.de>2018-05-26 20:16:56 +0200
commit10fe37dd1bb7f75ca68a442406c09ada6735f38b (patch)
tree13dd6c77d83af5a8a229b9de36a18547d885b4fc
parent1ae891c6b15e28b280845858326fb50ea5b61ac7 (diff)
Try to work around ubuntu gcc-5 ubsan build failure
[extended tests] Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/6362)
-rw-r--r--.travis.yml6
1 files changed, 5 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index e20c2084f0..1c1db2b73d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,7 +61,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test
compiler: gcc-5
- env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC"
+ env: UBUNTU_GCC_HACK="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC"
- os: linux
addons:
apt:
@@ -112,6 +112,10 @@ before_script:
srcdir=.;
top=.;
fi
+ - if [ -n "$UBUNTU_GCC_HACK" ]; then
+ $CC -dumpspecs | sed "s/--push-state//g; s/--pop-state/--as-needed/g" > gcc-specs.txt;
+ CC="$CC -specs=gcc-specs.txt";
+ fi
- if [ "$CC" == i686-w64-mingw32-gcc ]; then
export CROSS_COMPILE=${CC%%gcc}; unset CC;
$srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format;