From 38afef28a3c5af53e3c4e582f8a071f2dca91618 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Fri, 10 Sep 2010 11:45:27 +0200 Subject: [multiple changes] 2010-09-10 Emmanuel Briot * prj-util.adb (Executable_Of): Fix CE when the project does not contain a Builder package. 2010-09-10 Vincent Celier * prj-ext.adb (Initialize_Project_Path): Add /lib/gpr/ to the project path, if Prefix and Target_Name are defined. * prj-tree.ads (Project_Node_Tree_Data): New component Target_Name 2010-09-10 Ed Schonberg * checks.adb (Ensure_Valid): If the expression is a boolean expression or short-circuit operation, do no emit a validity check: only the elementary operands of the expression need checking. 2010-09-10 Ben Brosgol * gnat_rm.texi: Document Short_Descriptors. 2010-09-10 Arnaud Charlet * s-taprop-linux.adb, s-taskin.ads (Task_Alternate_Stack): Default initialize to Null_Address. (Enter_Task): Do not set up an alternate stack for foreign threads. From-SVN: r164149 --- gcc/ada/prj-ext.adb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gcc/ada/prj-ext.adb') diff --git a/gcc/ada/prj-ext.adb b/gcc/ada/prj-ext.adb index d867353..77d3379 100644 --- a/gcc/ada/prj-ext.adb +++ b/gcc/ada/prj-ext.adb @@ -250,13 +250,21 @@ package body Prj.Ext is Prefix := new String'(Executable_Prefix_Path); if Prefix.all /= "" then + if Tree.Target_Name /= null and then + Tree.Target_Name.all /= "" + then + Add_Str_To_Name_Buffer + (Path_Separator & Prefix.all & + "lib" & Directory_Separator & "gpr" & + Directory_Separator & Tree.Target_Name.all); + end if; + Add_Str_To_Name_Buffer (Path_Separator & Prefix.all & "share" & Directory_Separator & "gpr"); Add_Str_To_Name_Buffer (Path_Separator & Prefix.all & - Directory_Separator & "lib" & - Directory_Separator & "gnat"); + "lib" & Directory_Separator & "gnat"); end if; else -- cgit v1.1