diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2014-12-22 19:35:36 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2014-12-22 19:35:36 +0000 |
| commit | a776b0a741b26f9c3ce8a34f9176ee329ebd9989 (patch) | |
| tree | fd261d24ead3f1df31cf0fe8d75961c504444499 /jenkins.sh | |
| parent | 971937e9825435961a2e5f50d4c549ea8cf0ee71 (diff) | |
Fix bootstrap attempt
Sourcing host.conf overwrites bootstap variable.
Diffstat (limited to 'jenkins.sh')
| -rwxr-xr-x | jenkins.sh | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -58,7 +58,7 @@ fileserver="abe.tcwglab.linaro.org" languages=default # Whether attempt bootstrap -bootstrap=false +try_bootstrap=false # The release version string, usually a date releasestr= @@ -79,7 +79,7 @@ while test $# -gt 0; do -f|--fileserver) fileserver=$2 ;; -l|--languages) languages=$2 ;; -r|--runtests) runtests="true" ;; - -b|--bootstrap) bootstrap="true" ;; + -b|--bootstrap) try_bootstrap="true" ;; -h|--help) usage ;; esac shift @@ -197,22 +197,22 @@ fi # Delete the previous test result files to avoid problems. find ${user_workspace} -name \*.sum -exec rm {} \; 2>&1 > /dev/null -if test x"${bootstrap}" = xtrue; then +if test x"${try_bootstrap}" = xtrue; then # Attempt to bootstrap GCC is build and target are compatible build1="$(grep "^build=" host.conf | sed -e "s/build=\(.*\)-\(.*\)-\(.*\)-\(.*\)/\1-\3-\4/")" target1="$(echo ${target} | sed -e "s/\(.*\)-\(.*\)-\(.*\)-\(.*\)/\1-\3-\4/")" if test x"${build1}" = x"${target1}" -o x"${platform}" = x""; then - bootstrap="--enable bootstrap" + try_bootstrap="--enable bootstrap" else - bootstrap="--disable bootstrap" + try_bootstrap="--disable bootstrap" fi else - bootstrap="" + try_bootstrap="" fi # Now we build the cross compiler, for a native compiler this becomes # the stage2 bootstrap build. -$CONFIG_SHELL ${abe_dir}/abe.sh --parallel ${check} ${tars} ${releasestr} ${platform} ${change} ${bootstrap} --timeout 100 --build all --disable make_docs > build.out 2> >(tee build.err >&2) +$CONFIG_SHELL ${abe_dir}/abe.sh --parallel ${check} ${tars} ${releasestr} ${platform} ${change} ${try_bootstrap} --timeout 100 --build all --disable make_docs > build.out 2> >(tee build.err >&2) # If abe returned an error, make jenkins see this as a build failure if test $? -gt 0; then |