Merge pull request #7486 from Icinga/bugfix/http-header-error-handling

[icinga2] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 735e553f7bb5802d4a501d6f17d19eae48f33e78..bfc5587691f24ae464a7bf60a4430e74092e6757 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -240,7 +240,7 @@ endif()
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
   if(CMAKE_SYSTEM_NAME MATCHES AIX)
-    set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -g -lpthread")
+    set(CMAKE_C_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")
@@ -314,7 +314,7 @@ if(ICINGA2_LTO_BUILD)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flto")
 
     if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9.0) AND NOT OPENBSD)
       set(CMAKE_AR "gcc-ar")
@@ -390,12 +390,12 @@ if(NOT MSVC)
   )
 
   if (RESULT)
-    message(FATAL_ERROR "Failed to detect target architecture: ${RESULT}")
+    message(STATUS "Failed to detect target architecture with compiler ${CMAKE_C_COMPILER}: ${RESULT}")
   endif()
 
-  string(REGEX MATCH "([^-]+).*" ARCH_MATCH ${ARCH})
+  string(REGEX MATCH "([^-]+).*" ARCH_MATCH "${ARCH}")
   if (NOT CMAKE_MATCH_1 OR NOT ARCH_MATCH)
-    message(FATAL_ERROR "Failed to match the target architecture: ${ARCH}")
+    message(STATUS "Failed to match the target architecture: ${ARCH}")
   endif()
 
   set(ARCH ${CMAKE_MATCH_1})