From 1a54be06cd359257478b584611f34058d21fe723 Mon Sep 17 00:00:00 2001
From: iphydf <iphydf@users.noreply.github.com>
Date: Sun, 24 Jun 2018 22:56:07 +0000
Subject: Simplify Travis CI builds.

Have one script per build. This means more duplication between the
scripts, but it's much easier to understand and to run locally.
---
 other/docker/windows/build_toxcore.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'other/docker')

diff --git a/other/docker/windows/build_toxcore.sh b/other/docker/windows/build_toxcore.sh
index a3830455..da465eb1 100644
--- a/other/docker/windows/build_toxcore.sh
+++ b/other/docker/windows/build_toxcore.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 set -e -x
 
@@ -57,9 +57,13 @@ build()
         -DCMAKE_INSTALL_PREFIX="${STATIC_TOXCORE_PREFIX_DIR}" \
         -DENABLE_SHARED=OFF \
         -DENABLE_STATIC=ON \
+        -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS}" \
+        -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS}" \
+        -DCMAKE_EXE_LINKER_FLAGS="${CMAKE_EXE_LINKER_FLAGS}" \
+        -DCMAKE_SHARED_LINKER_FLAGS="${CMAKE_SHARED_LINKER_FLAGS}" \
         ${EXTRA_CMAKE_FLAGS} \
         ..
-    cmake --build . --target install
+    cmake --build . --target install -- -j$(nproc)
 
     if [ "${ENABLE_TEST}" = "true" ]; then
         rm -rf /root/.wine
@@ -79,7 +83,7 @@ build()
         if [ "${ALLOW_TEST_FAILURE}" = "true" ]; then
             set +e
         fi
-        cmake --build . --target test
+        cmake --build . --target test -- ARGS="-j50"
         if [ "${ALLOW_TEST_FAILURE}" = "true" ]; then
             set -e
         fi
-- 
cgit v1.2.3