]> granicus.if.org Git - icinga2/commitdiff
Fix build problems on AIX
authorGunnar Beutner <gunnar@beutner.name>
Wed, 1 Jul 2015 06:48:42 +0000 (08:48 +0200)
committerGunnar Beutner <gunnar@beutner.name>
Wed, 1 Jul 2015 06:48:42 +0000 (08:48 +0200)
fixes #9531

CMakeLists.txt
third-party/socketpair/socketpair.c

index 203a77e6177d600afd74dab79b224110369fdc59..3241607cd27908833ff98526bdd86dc5e58bbbc3 100644 (file)
@@ -142,8 +142,10 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
   endif()
 
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gc-sections -Wl,--no-export-dynamic -Bsymbolic-functions -Wl,--dynamic-list-cpp-typeinfo -Wl,--dynamic-list-data")
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--gc-sections -Wl,--no-export-dynamic -Bsymbolic-functions -Wl,--dynamic-list-cpp-typeinfo -Wl,--dynamic-list-data")
+  if(NOT CMAKE_SYSTEM_NAME MATCHES AIX)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gc-sections -Wl,--no-export-dynamic -Bsymbolic-functions -Wl,--dynamic-list-cpp-typeinfo -Wl,--dynamic-list-data")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--gc-sections -Wl,--no-export-dynamic -Bsymbolic-functions -Wl,--dynamic-list-cpp-typeinfo -Wl,--dynamic-list-data")
+  endif()
 endif()
 
 if(ICINGA2_LTO_BUILD)
index b8b9f2858c41efebeb80ea556cdf0bffb882b818..6ad0e7038583d940e6d62c95635a348b1ae47363 100644 (file)
@@ -146,7 +146,7 @@ int dumb_socketpair(int socks[2], int dummy)
         errno = EINVAL;
         return -1;
     }
-    dummy = socketpair(AF_LOCAL, SOCK_STREAM, 0, socks);
+    dummy = socketpair(AF_UNIX, SOCK_STREAM, 0, socks);
     if (dummy)
         socks[0] = socks[1] = -1;
     return dummy;