Skip to content

Commit

Permalink
Further work for GCC 11.
Browse files Browse the repository at this point in the history
  * INSTALL.md: Noted that RELEASE should be set to "gcc11" for GCC 11.
  * common/common.gpr (Compiler_Release): include "gcc11".
    (Release_Path): new, set to Release unless "gcc11", in which case
      set to "gnat-ce-2020".
    (Paths): use Release_Path.
  • Loading branch information
simonjwright committed May 4, 2021
1 parent 69839df commit 7882fb2
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Values for `RELEASE` are as below:
| FSF GCC 8 | `gcc8` |
| FSF GCC 9 | `gcc8` |
| FSF GCC 10 | `gcc8` |
| FSF GCC 11 | `gnat-ce-2020` |
| FSF GCC 11 | `gcc11` |
| GNAT GPL 2016 | `gcc6` |
| GNAT GPL 2017 | `gnat-gpl-2017` |
| GNAT CE 2018 | `gcc8` |
Expand Down
13 changes: 10 additions & 3 deletions common/common.gpr
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-- Copyright (C) 2018, 2020 Free Software Foundation, Inc.
-- Copyright (C) 2018-2021 Free Software Foundation, Inc.

-- This file is part of the Cortex GNAT RTS package.
--
Expand All @@ -19,14 +19,21 @@
abstract project Common is

type Compiler_Release is
("gcc6", "gnat-gpl-2017", "gcc7", "gcc8", "gnat-ce-2020");
("gcc6", "gnat-gpl-2017", "gcc7", "gcc8", "gnat-ce-2020", "gcc11");
Release : Compiler_Release := external ("RELEASE", "gcc8");
Release_Path := Release;
case Release is
when "gcc11" =>
Release_Path := "gnat-ce-2020";
when others =>
null;
end case;

type Install_Locally is ("yes", "no");
Local : Install_Locally := external ("INSTALL_LOCALLY", "yes");

Paths := (project'Project_Dir,
project'Project_Dir & "math",
project'Project_Dir & Release);
project'Project_Dir & Release_Path);

end Common;

0 comments on commit 7882fb2

Please sign in to comment.