diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2016-06-15 16:39:26 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2016-06-15 19:10:32 +0200 |
| commit | df18b3756fef6a28d9194368d3156f0cd85fae19 (patch) | |
| tree | caf39a8693ab3c0ebdf61e8806c37c9fc2fa5caa /scripts | |
| parent | a285f1895b9c28c7e634608948e40b7d19be03a8 (diff) | |
| download | master-31e0f0ae-df18b3756fef6a28d9194368d3156f0cd85fae19.tar.gz master-31e0f0ae-df18b3756fef6a28d9194368d3156f0cd85fae19.tar.bz2 master-31e0f0ae-df18b3756fef6a28d9194368d3156f0cd85fae19.zip | |
scripts: feeds: fix version detection for Make >= 4.2.1
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/feeds | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/feeds b/scripts/feeds index 2b88eb8193..55a8dd94ea 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -22,7 +22,10 @@ my @mkver = split /\s+/, `$mk -v`, 4; my $valid_mk = 1; $mkver[0] =~ /^GNU/ or $valid_mk = 0; $mkver[1] =~ /^Make/ or $valid_mk = 0; -$mkver[2] >= "3.81" or $valid_mk = 0; + +my ($mkv1, $mkv2) = split /\./, $mkver[2]; +($mkv1 >= 4 || ($mkv1 == 3 && $mkv2 >= 81)) or $valid_mk = 0; + $valid_mk or die "Unsupported version of make found: $mk\n"; my @feeds; |