Skip to content

Commit e2c23cc

Browse files
author
Damian Rouson
committed
fix installer behavior gcc clone already exists
1 parent 5a66338 commit e2c23cc

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

prerequisites/build-functions/download_if_necessary.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ download_if_necessary()
5858
;;
5959
esac
6060

61-
6261
if [[ -f "${download_path}/${url_tail}" || -d "${download_path}/${url_tail##*branches/}" && ! -z ${url_tail##*branches/} ]]; then
6362
info "Found '${url_tail##*branches/}' in ${download_path}."
6463
info "If it resulted from an incomplete download, building ${package_name} could fail."
@@ -86,7 +85,7 @@ download_if_necessary()
8685
else
8786

8887
if [[ "${fetch}" == "git" ]]; then
89-
package_source_directory="${url_tail}"
88+
package_source_directory="${package_name}"
9089
else
9190
package_source_directory="${package_name}-${version_to_build}"
9291
fi
@@ -101,7 +100,7 @@ download_if_necessary()
101100
return
102101
else
103102
if [[ "${fetch}" == "git" ]]; then
104-
search_path="${download_path}/${version_to_build}"
103+
search_path="${download_path}/${package_name}"
105104
else
106105
search_path="${download_path}/${url_tail}"
107106
fi

prerequisites/build-functions/set_or_print_url.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ else
5353
# Set differing tails for GCC release downloads versus development branch checkouts
5454
if [[ "${package_to_build}" == 'gcc' ]]; then
5555
if [[ "${fetch}" == 'git' ]]; then
56-
gcc_tail="gcc.git"
56+
gcc_tail="gcc"
5757
else
5858
gcc_tail="gcc-${version_to_build}.tar.gz"
5959
fi

0 commit comments

Comments
 (0)