From ef92d33af87cddb0269ac50ae78ee2499daf231d Mon Sep 17 00:00:00 2001 From: Monwarez Date: Sat, 25 Mar 2017 23:47:16 +0100 Subject: Use /usr/bin/env instead of full path to bash And also, use sysctl for detecting the number of CPU when the system is FreeBSD --- build.sh | 12 ++++++++++-- tools/ci/jobs/clang39.sh | 2 +- tools/ci/jobs/gcc46.sh | 2 +- tools/ci/jobs/gcc48.sh | 2 +- tools/ci/jobs/gcc49.sh | 2 +- tools/ci/jobs/gcc5.sh | 2 +- tools/ci/jobs/gcc6.sh | 2 +- tools/ci/jobs/gccsnapshot.sh | 2 +- tools/vars.sh | 2 +- 9 files changed, 18 insertions(+), 10 deletions(-) diff --git a/build.sh b/build.sh index dd6c379..6ed9fcd 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash CMD="$1" @@ -9,9 +9,17 @@ fi export LANG=C source tools/vars.sh +if [[ "$(uname)" == "FreeBSD" ]]; then + export CORES=$(sysctl hw.ncpu | awk '{print $2}') +else + export CORES=$(cat /proc/cpuinfo|grep processor|wc -l) +fi + mkdir build # this need for some outdated os mkdir m4 +# for some os, libtoolize should be launch +libtoolize -i autoreconf -i cd build if [[ "${CMD}" == "default" ]]; then @@ -23,7 +31,7 @@ elif [[ "${CMD}" == "gprof" ]]; then export CC=gcc ../configure --enable-gprof CPPFLAGS="${VARS}" fi -make -j3 +make -j${CORES} export RET=$? cd - exit $RET diff --git a/tools/ci/jobs/clang39.sh b/tools/ci/jobs/clang39.sh index baf2db1..41e4e8a 100755 --- a/tools/ci/jobs/clang39.sh +++ b/tools/ci/jobs/clang39.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash export CC=clang-3.9 export CXX=clang++-3.9 diff --git a/tools/ci/jobs/gcc46.sh b/tools/ci/jobs/gcc46.sh index f66f604..f2cf542 100755 --- a/tools/ci/jobs/gcc46.sh +++ b/tools/ci/jobs/gcc46.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash export CC=gcc-4.6 export CXX=g++-4.6 diff --git a/tools/ci/jobs/gcc48.sh b/tools/ci/jobs/gcc48.sh index e364a9c..1867d5f 100755 --- a/tools/ci/jobs/gcc48.sh +++ b/tools/ci/jobs/gcc48.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash export CC=gcc-4.8 export CXX=g++-4.8 diff --git a/tools/ci/jobs/gcc49.sh b/tools/ci/jobs/gcc49.sh index 88a7b96..800f970 100755 --- a/tools/ci/jobs/gcc49.sh +++ b/tools/ci/jobs/gcc49.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash export CC=gcc-4.9 export CXX=g++-4.9 diff --git a/tools/ci/jobs/gcc5.sh b/tools/ci/jobs/gcc5.sh index 5dcbe2a..cb959a1 100755 --- a/tools/ci/jobs/gcc5.sh +++ b/tools/ci/jobs/gcc5.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash export CC=gcc-5 export CXX=g++-5 diff --git a/tools/ci/jobs/gcc6.sh b/tools/ci/jobs/gcc6.sh index 34cf845..85f6748 100755 --- a/tools/ci/jobs/gcc6.sh +++ b/tools/ci/jobs/gcc6.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash export CC=gcc-6 export CXX=g++-6 diff --git a/tools/ci/jobs/gccsnapshot.sh b/tools/ci/jobs/gccsnapshot.sh index 542ce31..97fffaf 100755 --- a/tools/ci/jobs/gccsnapshot.sh +++ b/tools/ci/jobs/gccsnapshot.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash export CC=gcc export CXX=g++ diff --git a/tools/vars.sh b/tools/vars.sh index 5e52432..24d2aec 100755 --- a/tools/vars.sh +++ b/tools/vars.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # MAX_SKILL 1510 + 22 = 1532 # MAX_SKILL_ID 10015 + 22 + 9963 = 20022 -- cgit v1.2.3-60-g2f50