From 5071e39d5dd239577dae40782a7dc69033e8920c Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Fri, 10 Apr 2020 10:44:39 +0200
Subject: grt and ghdldrv: extract grt-exec.lst from grt.lst.  For #640

---
 src/ghdldrv/ghdldrv.adb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/ghdldrv/ghdldrv.adb')

diff --git a/src/ghdldrv/ghdldrv.adb b/src/ghdldrv/ghdldrv.adb
index c382f22bf..e15123ec6 100644
--- a/src/ghdldrv/ghdldrv.adb
+++ b/src/ghdldrv/ghdldrv.adb
@@ -1013,6 +1013,13 @@ package body Ghdldrv is
       end loop;
    end Bind_Anaelab;
 
+   --  Add PFX.lst from the install lib directory.
+   procedure Add_Lib_File_List (Pfx : String) is
+   begin
+      Add_File_List (Get_Machine_Path_Prefix & Directory_Separator
+                       & Pfx & List_Suffix, False);
+   end Add_Lib_File_List;
+
    procedure Link (Add_Std : Boolean; Disp_Only : Boolean)
    is
       Last_File : Natural;
@@ -1024,8 +1031,8 @@ package body Ghdldrv is
          Add_File_List (Filelist_Name.all, True);
       end if;
       Last_File := Filelist.Last;
-      Add_File_List (Get_Machine_Path_Prefix & Directory_Separator
-                       & "grt" & List_Suffix, False);
+      Add_Lib_File_List ("grt");
+      Add_Lib_File_List ("grt-exec");
 
       --  call the linker
       declare
-- 
cgit v1.2.3