Land #1332 - fix a few things on solaris

2 files changed, 5 insertions, 1 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 20d2faa..b1a1487 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -284,7 +284,8 @@ target_link_libraries(bn_mont ${OPENSSL_TEST_LIBS})
 add_platform_test(bn_mont bn_mont)
 
 # bn_mul_div
-if(NOT (WIN32 OR EMSCRIPTEN))
+# The benchmark code uses TIMEVAL_TO_TIMESPEC, which is unavailable on Solaris.
+if(NOT (WIN32 OR EMSCRIPTEN OR SOLARIS))
         add_executable(bn_mul_div bn_mul_div.c)
         target_link_libraries(bn_mul_div ${OPENSSL_TEST_LIBS})
         add_platform_test(bn_mul_div bn_mul_div)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a029d4a..d0b3adf 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -308,11 +308,14 @@ check_PROGRAMS += bn_mont
 bn_mont_SOURCES = bn_mont.c
 
 # bn_mul_div
+# The benchmark code uses TIMEVAL_TO_TIMESPEC, which is unavailable on Solaris.
 if !HOST_WIN
+if !HOST_SOLARIS
 TESTS += bn_mul_div
 check_PROGRAMS += bn_mul_div
 bn_mul_div_SOURCES = bn_mul_div.c
 endif
+endif
 
 # bn_primes
 TESTS += bn_primes