3 files changed, 1 insertions, 7 deletions

diff --git a/other/travis/env-freebsd.sh b/other/travis/env-freebsd.sh
index f9aa0cbf..882e9da5 100644
--- a/other/travis/env-freebsd.sh
+++ b/other/travis/env-freebsd.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 
 CMAKE=cmake
-# Asan is disabled because it's currently broken in FreeBSD 11.
-# We should try enabling it in the next FreeBSD release and see if it works.
-CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DASAN=OFF"
 NPROC=`nproc`
 CURDIR=/root
 RUN_TESTS=true
diff --git a/other/travis/env.sh b/other/travis/env.sh
index 7d90d395..2d3e646c 100644
--- a/other/travis/env.sh
+++ b/other/travis/env.sh
@@ -8,7 +8,6 @@ export PKG_CONFIG_PATH=$CACHE_DIR/lib/pkgconfig
 export ASTYLE=$CACHE_DIR/astyle/build/gcc/bin/astyle
 export CFLAGS="-O3 -DTRAVIS_ENV=1"
 export CXXFLAGS="-O3 -DTRAVIS_ENV=1"
-export CMAKE_EXTRA_FLAGS="-DERROR_ON_WARNING=ON"
 export MAKE=make
 
 BUILD_DIR=_build
diff --git a/other/travis/toxcore-script b/other/travis/toxcore-script
index f82fd978..ae2af416 100755
--- a/other/travis/toxcore-script
+++ b/other/travis/toxcore-script
@@ -28,14 +28,12 @@ RUN $CMAKE                                      \
   -B$BUILD_DIR                                  \
   -H.                                           \
   -DCMAKE_INSTALL_PREFIX:PATH=$CURDIR/_install  \
-  -DASAN=ON                                     \
   -DDEBUG=ON                                    \
   -DMUST_BUILD_TOXAV=ON                         \
   -DSTRICT_ABI=ON                               \
   -DTEST_TIMEOUT_SECONDS=120                    \
   -DTRACE=ON                                    \
-  -DUSE_IPV6=$USE_IPV6                          \
-  $CMAKE_EXTRA_FLAGS
+  -DUSE_IPV6=$USE_IPV6
 
 export CTEST_OUTPUT_ON_FAILURE=1