Skip to content
This repository has been archived by the owner on Apr 25, 2020. It is now read-only.

Commit

Permalink
Ensure only gcc release can be used to build gcc and mipspro for the …
Browse files Browse the repository at this point in the history
…other one too
  • Loading branch information
danielhams committed Oct 31, 2019
1 parent 21e840b commit 54101ea
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
6 changes: 4 additions & 2 deletions DidbsUtils.pm
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ sub compatibledidbscurrent
{
my $retVal=1;
my $verbose=shift;
my $didbscompiler=shift;
my $version=shift;
my($scriptMajVer,$scriptGenVer,$scriptMinVer) =
$version =~ m/(\d)\.(\d)\.(\d)(.*)/;
Expand All @@ -88,8 +89,9 @@ sub compatibledidbscurrent
my($dirMajVer,$dirGenVer,$dirMinVer,$dirRest) =
$dirBehindLink =~ m/(\d)_(\d)_(\d)[^_]*(_.+)/;
$verbose && didbsprint "Matched $dirMajVer $dirGenVer $dirMinVer $dirRest\n";
if( rindex($dirRest,"_n32_mips3_") == 0 ) {
$verbose && didbsprint "Elf width, ISA OK\n";
my $expectedWidthIsaCompiler = "_n32_mips3_" . $didbscompiler;
if( rindex($dirRest,$expectedWidthIsaCompiler) == 0 ) {
$verbose && didbsprint "Elf width, ISA, Compiler OK\n";
# Version check min is 0.1.7 (starting from 0.1.7)
# due to the need for a particular didbs perl version.
# max is current script minus one
Expand Down
4 changes: 2 additions & 2 deletions bootstrap.pl
Original file line number Diff line number Diff line change
Expand Up @@ -266,12 +266,12 @@ sub writeconfig
usage(true);
}

my $compatibleDidbsCurrent = compatibledidbscurrent($verbose,$version);
my $compatibleDidbsCurrent = compatibledidbscurrent($verbose,$didbscompiler,$version);
if( !$compatibleDidbsCurrent )
{
print <<EOINCOMPATIBLEDIDBSCURRENT
ERROR
Starting with 0.1.6alpha, running bootstrap requires an existing compatible
For didbs 0.1.7, running bootstrap requires an existing compatible
didbs release behind a symbolic link at /usr/didbs/current.
Unable to continue.
EOINCOMPATIBLEDIDBSCURRENT
Expand Down

0 comments on commit 54101ea

Please sign in to comment.