From b73bed2992c6f58d822eb785b333324e48ef98b7 Mon Sep 17 00:00:00 2001 From: Dan Miller Date: Mon, 19 Sep 2016 16:19:54 -0700 Subject: [PATCH 1/2] Don't define stdc++ on FreeBSD --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f15c73d..2193d449 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -513,7 +513,7 @@ else() # There is a clang bug that does not allow to compile code that uses AES-NI intrinsics if -flto is enabled, so explicitly disable set(USE_LTO false) # explicitly define stdlib for older versions of clang - if(CMAKE_C_COMPILER_VERSION VERSION_LESS 3.7) + if(CMAKE_C_COMPILER_VERSION VERSION_LESS 3.7 AND NOT FREEBSD) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libstdc++") endif() From 344e96cc083a977a88ea9a3e0bc4dddcc2ef91ea Mon Sep 17 00:00:00 2001 From: Dan Miller Date: Wed, 21 Sep 2016 06:42:21 -0700 Subject: [PATCH 2/2] remove check for certain clang versions --- CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2193d449..e7c3b69b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -512,11 +512,6 @@ else() if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") # There is a clang bug that does not allow to compile code that uses AES-NI intrinsics if -flto is enabled, so explicitly disable set(USE_LTO false) - # explicitly define stdlib for older versions of clang - if(CMAKE_C_COMPILER_VERSION VERSION_LESS 3.7 AND NOT FREEBSD) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libstdc++") - endif() endif()