summaryrefslogtreecommitdiff
path: root/other
diff options
context:
space:
mode:
authoriphydf <iphydf@users.noreply.github.com>2018-01-22 09:37:31 +0000
committeriphydf <iphydf@users.noreply.github.com>2018-01-22 21:05:30 +0000
commit8f1bbcf83e23286ebdfd17b83d886fc8f0a3eb2a (patch)
tree8b73a35a6104159f5055f1e0b42a63004758bc8f /other
parente6c04ef0287a69c453f129778ef35932e0dff4b2 (diff)
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.
Diffstat (limited to 'other')
-rw-r--r--other/travis/env-windows.sh2
-rwxr-xr-xother/travis/toxcore-script12
2 files changed, 1 insertions, 13 deletions
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 @@
1#!/bin/sh 1#!/bin/sh
2 2
3CMAKE=$ARCH-w64-mingw32.shared-cmake 3CMAKE=$ARCH-w64-mingw32.shared-cmake
4CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DBOOTSTRAP_DAEMON=OFF -DCOMPILE_AS_CXX=ON" 4CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DBOOTSTRAP_DAEMON=OFF -DERROR_ON_WARNING=OFF"
5NPROC=`nproc` 5NPROC=`nproc`
6CURDIR=/work 6CURDIR=/work
7RUN_TESTS=true 7RUN_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() {
10 set -e 10 set -e
11} 11}
12 12
13# Try some combinations of cmake options.
14for i in `seq 0 7`; do
15 set +x
16 opts="$CMAKE_EXTRA_FLAGS -DWARNINGS=OFF"
17 set_opt STRICT_ABI
18 set_opt ENABLE_STATIC
19 set_opt ENABLE_SHARED
20 set -x
21 RUN $CMAKE -B$BUILD_DIR -H. $opts
22 RUN rm -rf $BUILD_DIR
23done
24
25if perl -e ' 13if perl -e '
26 use Socket qw(PF_INET6 SOCK_STREAM pack_sockaddr_in6 IN6ADDR_LOOPBACK); 14 use Socket qw(PF_INET6 SOCK_STREAM pack_sockaddr_in6 IN6ADDR_LOOPBACK);
27 15