From patchwork Mon Jun 14 08:07:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Charlet X-Patchwork-Id: 55483 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id B535A1007D1 for ; Mon, 14 Jun 2010 18:08:02 +1000 (EST) Received: (qmail 13670 invoked by alias); 14 Jun 2010 08:07:53 -0000 Received: (qmail 13644 invoked by uid 22791); 14 Jun 2010 08:07:51 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, TW_PR, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mel.act-europe.fr (HELO mel.act-europe.fr) (212.99.106.210) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 14 Jun 2010 08:07:44 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 366CFCB021C; Mon, 14 Jun 2010 10:07:47 +0200 (CEST) Received: from mel.act-europe.fr ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ObCzpshGU47P; Mon, 14 Jun 2010 10:07:47 +0200 (CEST) Received: from saumur.act-europe.fr (saumur.act-europe.fr [10.10.0.183]) by mel.act-europe.fr (Postfix) with ESMTP id 0B0CACB021B; Mon, 14 Jun 2010 10:07:47 +0200 (CEST) Received: by saumur.act-europe.fr (Postfix, from userid 525) id 0BD58D8808; Mon, 14 Jun 2010 10:07:53 +0200 (CEST) Date: Mon, 14 Jun 2010 10:07:53 +0200 From: Arnaud Charlet To: gcc-patches@gcc.gnu.org Cc: Pascal Obry Subject: [Ada] Fix copy of object directory for extending projects Message-ID: <20100614080753.GA23991@adacore.com> Mime-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.9i X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org 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 * prj-proc.adb: Fix copy of object directory for extending projects. 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;