aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRyan Arnold <ryan.arnold@linaro.org>2015-07-23 18:15:11 +0000
committerLinaro Code Review <review@review.linaro.org>2015-07-23 18:15:11 +0000
commit54776f1ddb1c653c0e0d19c8c5d65121184eeb5e (patch)
treecd3b453ec3fc6faa57463778f90fb12c5cc2c912 /scripts
parent43bcff01aa7d5accb2f4f16efd95c674b0560690 (diff)
parent38e32433edb76abe2fd264fd40a2b1c6b37b2b5b (diff)
Merge "If the gcc or binutils source isn't specified, just use the default latest version from the config files."
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/MakeRelease.job7
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/MakeRelease.job b/scripts/MakeRelease.job
index 6eef99ef..4187ffd1 100755
--- a/scripts/MakeRelease.job
+++ b/scripts/MakeRelease.job
@@ -89,10 +89,13 @@ else
libc="--set libc=newlib"
fi
+binutils=${binutils_src:+binutils=${binutils_src}}
+gcc=${gcc_src:+gcc=${gcc_src}}
+
# Build a toolchain, run the tests, and the create a source release as a tarball
if test x"${tarsrc}" = x"yes"; then
$CONFIG_SHELL ${abe_dir}/abe.sh --release ${release} \
- --tarsrc ${check} gcc=${gcc_src} binutils=${binutil s_src} ${platform} -build all ${libc}
+ --tarsrc ${check} ${gcc} ${binutils} ${platform} -build all ${libc}
fi
# Build a binary release tarball, then run the tests on the installed binaries
@@ -106,7 +109,7 @@ if test x"${tarbin}" = x"yes"; then
else
host=""
fi
- $CONFIG_SHELL ${abe_dir}/abe.sh ${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} ${binutils } ${platform} ${host} --build all ${libc}
fi
# force a failure if abe has build problems.