File tree 2 files changed +11
-6
lines changed
prerequisites/build-functions
2 files changed +11
-6
lines changed Original file line number Diff line number Diff line change @@ -11,9 +11,7 @@ set_or_print_downloader()
11
11
12
12
package_name=" ${arg_p:- ${arg_D:- ${arg_P:- ${arg_U:- ${arg_V} } } } } "
13
13
14
- if [[ " ${package_name} " == " gcc" ]]; then
15
- arg_b=${arg_b:- releases/ gcc-${version_to_build} }
16
- elif [[ " ${package_name} " == " ofp" ]]; then
14
+ if [[ " ${package_name} " == " ofp" ]]; then
17
15
" ${OPENCOARRAYS_SRC_DIR} /prerequisites/install-ofp.sh" " ${@ } "
18
16
exit 0
19
17
fi
@@ -36,7 +34,7 @@ set_or_print_downloader()
36
34
tried=" curl, wget, and ftp"
37
35
fi
38
36
39
- if [[ " ${package_name} " == " gcc" ]]; then
37
+ if [[ " ${package_name} " == " gcc" && ! -z ${arg_b :- } ]]; then
40
38
if type git & > /dev/null; then
41
39
fetch=git
42
40
else
Original file line number Diff line number Diff line change 21
21
major_minor=" ${version_to_build% .* } "
22
22
fi
23
23
package_url_head=(
24
- " gcc;https://gcc .gnu.org/git /"
24
+ " gcc;https://ftp .gnu.org/gnu/gcc/gcc- ${version_to_build-} /"
25
25
" wget;https://ftpmirror.gnu.org/gnu/wget/"
26
26
" m4;https://ftpmirror.gnu.org/gnu/m4/"
27
27
" pkg-config;https://pkgconfig.freedesktop.org/releases/"
44
44
fi
45
45
done
46
46
47
+ if [[ ! -z ${arg_b:- } && ${package_to_build} == ' gcc' ]]; then
48
+ url_head=" https://gcc.gnu.org/git/"
49
+ fi
50
+
47
51
# Set differing tails for GCC release downloads versus development branch checkouts
48
52
package_url_tail=(
49
- " gcc;gcc"
53
+ " gcc;gcc- ${version_to_build-} .tar.gz "
50
54
" wget;wget-${version_to_build-} .tar.gz"
51
55
" m4;m4-${version_to_build-} .tar.bz2"
52
56
" pkg-config;pkg-config-${version_to_build-} .tar.gz"
71
75
fi
72
76
done
73
77
78
+ if [[ ! -z ${arg_b:- } && ${package_to_build} == ' gcc' ]]; then
79
+ url_tail=" gcc"
80
+ fi
74
81
75
82
if [[ -z " ${url_head:- } " || -z " ${url_tail} " ]]; then
76
83
emergency " Package ${package_name:- } not recognized. Use --l or --list-packages to list the allowable names."
You can’t perform that action at this time.
0 commit comments