2 files changed, 18 insertions, 6 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 56773dbb..bd22e8d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,6 +62,18 @@ if(APPLE)
   include(MacRpath)
 endif()
 
+if(UNIX)
+    if(CMAKE_SYSTEM_NAME MATCHES ".*Linux")
+        set(LINUX TRUE)
+    elseif(CMAKE_SYSTEM_NAME MATCHES "kOpenBSD.*|OpenBSD.*")
+        set(OPENBSD TRUE)
+    elseif(CMAKE_SYSTEM_NAME MATCHES "kNetBSD.*|NetBSD.*")
+        set(NETBSD TRUE)
+    elseif(CMAKE_SYSTEM_NAME MATCHES "kFreeBSD.*|FreeBSD")
+        set(FREEBSD TRUE)
+    endif()
+endif()
+
 enable_testing()
 
 set(CMAKE_MACOSX_RPATH ON)
@@ -184,10 +196,10 @@ if(ASAN)
 else()
   # Forbid undefined symbols in shared libraries. This is incompatible with
   # asan, so it's in the else branch here.
-  if(APPLE)
-    add_dllflag("-undefined error")
-  else()
+  if(LINUX)
     add_dllflag("-Wl,-z,defs")
+  else()
+    add_dllflag("-undefined error")
   endif()
 endif()
 
diff --git a/toxcore/ccompat.h b/toxcore/ccompat.h
index b70850d2..f4aa1d89 100644
--- a/toxcore/ccompat.h
+++ b/toxcore/ccompat.h
@@ -22,13 +22,13 @@
 // Emulation using alloca.
 #ifdef _WIN32
 #include <malloc.h>
-#elif defined(__FreeBSD__)
+#elif defined(__linux__)
+#include <alloca.h>
+#else
 #include <stdlib.h>
 #if !defined(alloca) && defined(__GNUC__)
 #define alloca __builtin_alloca
 #endif
-#else
-#include <alloca.h>
 #endif
 
 #define VLA(type, name, size)                           \