From 8f1bbcf83e23286ebdfd17b83d886fc8f0a3eb2a Mon Sep 17 00:00:00 2001
From: iphydf <iphydf@users.noreply.github.com>
Date: Mon, 22 Jan 2018 09:37:31 +0000
Subject: Use <stdlib.h> for alloca on FreeBSD.

https://www.freebsd.org/cgi/man.cgi?alloca

If stdlib.h does not define alloca, and we're using GCC (or Clang), we
define the macro ourselves in terms of a GCC builtin.
---
 other/travis/env-windows.sh |  2 +-
 other/travis/toxcore-script | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

(limited to 'other')

diff --git a/other/travis/env-windows.sh b/other/travis/env-windows.sh
index 6f7f0914..d5e485f1 100644
--- a/other/travis/env-windows.sh
+++ b/other/travis/env-windows.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 CMAKE=$ARCH-w64-mingw32.shared-cmake
-CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DBOOTSTRAP_DAEMON=OFF -DCOMPILE_AS_CXX=ON"
+CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DBOOTSTRAP_DAEMON=OFF -DERROR_ON_WARNING=OFF"
 NPROC=`nproc`
 CURDIR=/work
 RUN_TESTS=true
diff --git a/other/travis/toxcore-script b/other/travis/toxcore-script
index 54ee41a9..763be2e4 100755
--- a/other/travis/toxcore-script
+++ b/other/travis/toxcore-script
@@ -10,18 +10,6 @@ set_opt() {
   set -e
 }
 
-# Try some combinations of cmake options.
-for i in `seq 0 7`; do
-  set +x
-  opts="$CMAKE_EXTRA_FLAGS -DWARNINGS=OFF"
-  set_opt STRICT_ABI
-  set_opt ENABLE_STATIC
-  set_opt ENABLE_SHARED
-  set -x
-  RUN $CMAKE -B$BUILD_DIR -H. $opts
-  RUN rm -rf $BUILD_DIR
-done
-
 if perl -e '
     use Socket qw(PF_INET6 SOCK_STREAM pack_sockaddr_in6 IN6ADDR_LOOPBACK);
 
-- 
cgit v1.2.3