From 81a5429e5601956987a6113a4e8e527e46566e75 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Fri, 3 Aug 2018 05:44:30 -0400 Subject: [PATCH] Remove iPhoneSimulator from Travis allowed failures --- .travis.yml | 5 ----- rdrand.cpp | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 868c01af..f4106a5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -147,11 +147,6 @@ matrix: - BUILD_OS=linux - BUILD_MODE=android - PLATFORM=mipsel64 - - os: osx - env: - - BUILD_OS=osx - - BUILD_MODE=ios - - PLATFORM=iPhoneSimulator before_install: - | diff --git a/rdrand.cpp b/rdrand.cpp index dfe06d89..9aae80d9 100644 --- a/rdrand.cpp +++ b/rdrand.cpp @@ -31,8 +31,8 @@ # define MASM_RDSEED_ASM_AVAILABLE 1 # endif -# if (__SUNPRO_CC >= 0x5100) || (CRYPTOPP_GCC_VERSION >= 30200) || \ - (CRYPTOPP_CLANG_VERSION >= 20800) || (CRYPTOPP_APPLE_CLANG_VERSION >= 30000) +# if (__SUNPRO_CC >= 0x5100) || (CRYPTOPP_APPLE_CLANG_VERSION >= 30000) || \ + (CRYPTOPP_CLANG_VERSION >= 20800) || (CRYPTOPP_GCC_VERSION >= 30200) # define GCC_RDRAND_ASM_AVAILABLE 1 # define GCC_RDSEED_ASM_AVAILABLE 1 # endif