From 0df38c3506efbe8aac5ce7a695c01d487348dcc1 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Sun, 28 May 2017 17:00:09 -0400
Subject: [PATCH] Fix build timeout due to tracking vars under UBsan Also see
 https://stackoverflow.com/q/2954473/608639 and
 https://stackoverflow.com/q/708807/608639

---
 .travis.yml | 3 ++-
 GNUmakefile | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 73036cf3..153e3422 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,7 @@ env:
     - BUILD_MODE="codecov"
 
 matrix:
+
   exclude:
     # Skip GCC on OS X entirely
     - os: osx
@@ -43,7 +44,7 @@ matrix:
     - env: BUILD_MODE="asan"
 
 script:
-  - travis_wait make "$BUILD_MODE" && ./cryptest.exe v && ./cryptest.exe tv all
+  - make "$BUILD_MODE" && ./cryptest.exe v && ./cryptest.exe tv all
 
 after_success:
   - if [[ ( ("$BUILD_MODE" = "coverage") && ("$CC" = "gcc") ) ]]; then CODECOV_TOKEN="5c7bc59c-e95f-4594-82c3-33e7a1942592" bash <(curl -s https://codecov.io/bash); fi;
diff --git a/GNUmakefile b/GNUmakefile
index 93c8a853..43ef267a 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -817,6 +817,13 @@ rdrand-%.o:
 	./rdrand-nasm.sh
 endif
 
+# Don't build Threefish with UBsan on Travis CI. Timeouts cause the build to fail.
+#   Also see https://stackoverflow.com/q/12983137/608639.
+ifeq ($(findstring true,$(CI)),true)
+threefish.o : threefish.cpp
+	$(CXX) $(strip $(subst -fsanitize=undefined,,$(CXXFLAGS))) -c $<
+endif
+
 # Don't build Rijndael with UBsan. Too much noise due to unaligned data accesses.
 ifneq ($(findstring -fsanitize=undefined,$(CXXFLAGS)),)
 rijndael.o : rijndael.cpp