diff --git a/lib/yashchiki/fetch.sh b/lib/yashchiki/fetch.sh index 7a4db2dff9b21922bef6bbd7fef43ad6b30a0a56..362dce959d102c6b38c9d60eee4451d38ae30d0d 100755 --- a/lib/yashchiki/fetch.sh +++ b/lib/yashchiki/fetch.sh @@ -91,13 +91,9 @@ for package in "${packages_to_fetch[@]}"; do eval "${oldstate}" tmp_err="$(mktemp)" tmpfiles_concretize_err+=("${tmp_err}") - # We need to strip the compiler spec starting with '%' from the spec string - # because the compiler is not yet known. - # Note that this will also delete target information right now! - package_wo_compiler="${package%%%*}" ( set -x; - ( specfile=$(get_specfile_name "${package_wo_compiler}"); - (${MY_SPACK_CMD} spec --fresh -y "${package_wo_compiler}" > "${specfile}") + ( specfile=$(get_specfile_name "${package}"); + (${MY_SPACK_CMD} spec --fresh -y "${package}" > "${specfile}") ) 2>"${tmp_err}" \ || ( echo "CONCRETIZING FAILED" >> "${tmpfiles_concretize_err[0]}" ); ) & @@ -148,8 +144,7 @@ find "${MY_SPACK_FOLDER}/var/spack/repos" -type f -print0 \ # now fetch everything that is needed in order fetch_specfiles=() for package in "${packages_to_fetch[@]}"; do - package_wo_compiler="${package%%%*}" - specfile="$(get_specfile_name "${package_wo_compiler}")" + specfile="$(get_specfile_name "${package}")" if (( $(wc -l <"${specfile}") == 0 )); then echo "${package} failed to concretize!" >&2 exit 1