From d8203f4bb53327bd0840ac5491c6faa973ba7278 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Fri, 13 Feb 2015 11:21:20 +0100 Subject: [PATCH] Build fix for OpenBSD fixes #8434 --- CMakeLists.txt | 8 +++++++- third-party/execvpe/execvpe.c | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e9ad834c..52886623a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,10 +122,16 @@ if(CMAKE_C_COMPILER_ID STREQUAL "SunPro") endif() if(CMAKE_C_COMPILER_ID STREQUAL "GNU") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g") if(CMAKE_SYSTEM_NAME MATCHES AIX) + set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -g -lpthread") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -lpthread") + elseif(CMAKE_SYSTEM_NAME MATCHES "kOpenBSD.*|OpenBSD.*") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -pthread") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -pthread") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lpthread") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lpthread") else() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g") endif() endif() diff --git a/third-party/execvpe/execvpe.c b/third-party/execvpe/execvpe.c index c0528b10d..05a72ebe6 100644 --- a/third-party/execvpe/execvpe.c +++ b/third-party/execvpe/execvpe.c @@ -17,9 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#ifndef __FreeBSD__ +#if !defined(__FreeBSD__) && !defined(__OpenBSD__) #include -#endif /* _FreeBSD__ */ +#endif /* !__FreeBSD__ && !__OpenBSD__ */ #include #include #include