From e726be425740402ab57e91a66d2cd8b812974bf4 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Wed, 10 Jun 2015 03:58:37 +0200
Subject: Use directory of output for elaboration file.

---
 src/ghdldrv/ghdllocal.adb | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

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

diff --git a/src/ghdldrv/ghdllocal.adb b/src/ghdldrv/ghdllocal.adb
index 841971539..bd4257cbe 100644
--- a/src/ghdldrv/ghdllocal.adb
+++ b/src/ghdldrv/ghdllocal.adb
@@ -564,19 +564,13 @@ package body Ghdllocal is
      return String_Access
    is
       use Name_Table;
-      Basename : constant String := Get_Base_Name (File);
    begin
       if In_Work then
-         Image (Libraries.Work_Directory);
+         return new String'(Image (Libraries.Work_Directory)
+                              & Get_Base_Name (File) & Suffix);
       else
-         Nam_Length := Nam_Buffer'First - 1;
+         return new String'(File & Suffix);
       end if;
-      Nam_Buffer (Nam_Length + 1 .. Nam_Length + Basename'Length) :=
-        Basename;
-      Nam_Length := Nam_Length + Basename'Length;
-      Nam_Buffer (Nam_Length + 1 .. Nam_Length + Suffix'Length) := Suffix;
-      Nam_Length := Nam_Length + Suffix'Length;
-      return new String'(Nam_Buffer (1 .. Nam_Length));
    end Append_Suffix;
 
 
-- 
cgit v1.2.3