aboutsummaryrefslogtreecommitdiff
path: root/tools/buildsteps
diff options
context:
space:
mode:
authorwsnipex <wsnipex@a1.net>2013-09-13 10:28:11 +0200
committerwsnipex <wsnipex@a1.net>2013-09-17 10:40:43 +0200
commit3d30679b5b52e1fe7b9acc6287bed2a349e50027 (patch)
treee615566d64af26751145a134b2f182098b536b71 /tools/buildsteps
parentb282ac4dde72a18654b9d73fee5b02b85238c180 (diff)
[buildsteps] if multithreaded building fails on linux, rerun make singlethreaded once more
Diffstat (limited to 'tools/buildsteps')
-rwxr-xr-xtools/buildsteps/linux64/make-depends2
-rwxr-xr-xtools/buildsteps/linux64/make-xbmc2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/buildsteps/linux64/make-depends b/tools/buildsteps/linux64/make-depends
index c9c98aa09a..1c27c13b29 100755
--- a/tools/buildsteps/linux64/make-depends
+++ b/tools/buildsteps/linux64/make-depends
@@ -4,6 +4,6 @@ XBMC_PLATFORM_DIR=linux64
if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
then
- cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS && tagSuccessFulBuild .
+ cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS || make && tagSuccessFulBuild .
fi
diff --git a/tools/buildsteps/linux64/make-xbmc b/tools/buildsteps/linux64/make-xbmc
index 10200c8529..0a65536570 100755
--- a/tools/buildsteps/linux64/make-xbmc
+++ b/tools/buildsteps/linux64/make-xbmc
@@ -2,4 +2,4 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
XBMC_PLATFORM_DIR=linux64
. $WORKSPACE/tools/buildsteps/defaultenv
-cd $WORKSPACE;make -j$BUILDTHREADS
+cd $WORKSPACE;make -j$BUILDTHREADS || make