Patchwork [Ada] Fix copy of object directory for extending projects

login
register
mail settings
Submitter Arnaud Charlet
Date June 14, 2010, 8:07 a.m.
Message ID <20100614080753.GA23991@adacore.com>
Download mbox | patch
Permalink /patch/55483/
State New
Headers show

Comments

Arnaud Charlet - June 14, 2010, 8:07 a.m.
We want to copy not only the Name but also the Display_Name

Tested on x86_64-pc-linux-gnu, committed on trunk

2010-06-14  Pascal Obry  <obry@adacore.com>

	* prj-proc.adb: Fix copy of object directory for extending projects.

Patch

Index: prj-proc.adb
===================================================================
--- prj-proc.adb	(revision 160705)
+++ prj-proc.adb	(working copy)
@@ -2274,13 +2274,13 @@  package body Prj.Proc is
           Is_Extending_All (From_Project_Node, From_Project_Node_Tree)
       then
          declare
-            Object_Dir : constant Path_Name_Type :=
-                           Project.Object_Directory.Name;
+            Object_Dir : constant Path_Information :=
+                           Project.Object_Directory;
          begin
             Prj := In_Tree.Projects;
             while Prj /= null loop
                if Prj.Project.Virtual then
-                  Prj.Project.Object_Directory.Name := Object_Dir;
+                  Prj.Project.Object_Directory := Object_Dir;
                end if;
                Prj := Prj.Next;
             end loop;