aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Arnold <ryan.arnold@linaro.org>2015-07-02 15:03:16 +0000
committerLinaro Code Review <review@review.linaro.org>2015-07-02 15:03:16 +0000
commit3907e14a33415120edf116591bbb83e5ecfaaea7 (patch)
tree368761e65ca6b25761248dc8774b6eef5a8dcc8c
parent65cc3d6d20246e5d2e5a929cc11f240cd53cf032 (diff)
parent60fcc37b6a3e6fea2c0b7cbea332e8facfda7458 (diff)
Merge "always update sources the first time only."
-rwxr-xr-xscripts/MakeRelease.job8
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/MakeRelease.job b/scripts/MakeRelease.job
index c957d8a8..ff13cd33 100755
--- a/scripts/MakeRelease.job
+++ b/scripts/MakeRelease.job
@@ -51,6 +51,9 @@ else
rm -fr ${user_workspace}/_build/* ${user_workspace}/_build/sysroots/*
fi
+# By default, always update all sources
+update=""
+
if test x"${runtests}" = xtrue; then
chroot="--enable-schroot-test"
fi
@@ -94,13 +97,14 @@ fi
if test x"${tarbin}" = x"yes"; then
# Canadian cross builds require a Linux hosted cross compiler first
if test x"${canadian}" = x"true"; then
- $CONFIG_SHELL ${abe_dir}/abe.sh --disable update --release ${release} ${check} gcc=${gcc_src} binutils=${binutils_src} ${platform} --build all ${libc}
+ $CONFIG_SHELL ${abe_dir}/abe.sh ${update} --release ${release} ${check} gcc=${gcc_src} binutils=${binutils_src} ${platform} --build all ${libc}
host="--host i686-w64-mingw32"
rm -fr ${local_builds}/${host}/${target}/
+ update="--disable update"
else
host=""
fi
- $CONFIG_SHELL ${abe_dir}/abe.sh --disable update --release ${release} --tarbin ${check} gcc=${gcc_src} binutils=${binutils_src} ${platform} ${host} --build all ${libc}
+ $CONFIG_SHELL ${abe_dir}/abe.sh ${update} --release ${release} --tarbin ${check} gcc=${gcc_src} binutils=${binutils_src} ${platform} ${host} --build all ${libc}
fi
# force a failure if abe has build problems.