Skip to content

Commit ac6cdd2

Browse files
committed
Update minimum gcc version in 'bldlvlck'
Update minimum gcc version from 4.6.2 to 6.2.0. If $CC environment variable is set, use that instead of 'gcc'.
1 parent 58985c2 commit ac6cdd2

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

util/bldlvlck

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# This perl script checks the user's system for the required levels of
88
# software needed to properly build Hercules from the source repository.
99
#
10-
# Updated 3 DEC 2021
10+
# Updated 11 DEC 2021
1111
#
1212
#****************************************************************************
1313

@@ -34,7 +34,7 @@ my @req = qw(
3434
cmake 3.2 0 https://cmake.org
3535
flex 2.5 0 http://www.gnu.org/directory/flex.html
3636
gawk 3.0 0 http://www.gnu.org/directory/gawk.html
37-
gcc 4.6.2 1 http://www.gnu.org/directory/gcc.html
37+
gcc 6.2.0 1 http://www.gnu.org/directory/gcc.html
3838
grep 1 0 http://www.gnu.org/directory/grep.html
3939
ld 2.22 0 http://www.gnu.org/directory/binutils.html
4040
libtool 2.4.6 1 https://sdl-hercules-390.github.io/html/hercinst.html
@@ -245,8 +245,11 @@ sub weird {
245245
return;
246246
}
247247

248+
248249
if ($facility eq 'gcc') {
249-
if (present($facility, $url)) {
250+
my $cc = $ENV{"CC"} || "gcc";
251+
252+
if (present($cc, $url)) {
250253
my @resp;
251254
if ($^O eq 'netbsd') {
252255
@resp = `$facility -dumpversion`;
@@ -263,7 +266,7 @@ sub weird {
263266
print "$msg\t$facility (32-bit) requires $gcc_i686_required, found $instversion\n";
264267
} else {
265268
$msg = ckvers($level, $instversion);
266-
print "$msg\t$facility requires $level, found $instversion\n";
269+
print "$msg\t$facility requires $level, found $cc $instversion\n";
267270
}
268271
print "\tURL: $url\n" if $msg eq 'UPGRADE';
269272
}
@@ -282,7 +285,7 @@ sub weird {
282285
print "\t$resp[0]\n";
283286
if ($resp[0] =~ /sed: unknown option/) {
284287
# print "netbsd: \n";
285-
}
288+
}
286289

287290
print "$msg\t$facility requires $level, found $instversion\n";
288291
print "\tURL: $url\n" if $msg eq 'UPGRADE';
@@ -297,7 +300,7 @@ sub weird {
297300
print "\t$resp[0]\n";
298301
if ($resp[0] =~ /sed: unknown option/) {
299302
# print "netbsd: \n";
300-
}
303+
}
301304

302305
print "$msg\t$facility requires $level, found $instversion\n";
303306
print "\tURL: $url\n" if $msg eq 'UPGRADE';

0 commit comments

Comments
 (0)