diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-09-10 11:45:27 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-09-10 11:45:27 +0200 |
| commit | 38afef28a3c5af53e3c4e582f8a071f2dca91618 (patch) | |
| tree | 20e2d444c0696d09f6e8ef992b4bc959dce87426 /gcc/ada/prj-ext.adb | |
| parent | eafedef3836563374ab1c4509e2a386c8156af7f (diff) | |
| download | gcc-38afef28a3c5af53e3c4e582f8a071f2dca91618.zip gcc-38afef28a3c5af53e3c4e582f8a071f2dca91618.tar.gz gcc-38afef28a3c5af53e3c4e582f8a071f2dca91618.tar.bz2 | |
[multiple changes]
2010-09-10 Emmanuel Briot <briot@adacore.com>
* prj-util.adb (Executable_Of): Fix CE when the project does not
contain a Builder package.
2010-09-10 Vincent Celier <celier@adacore.com>
* prj-ext.adb (Initialize_Project_Path): Add <prefix>/lib/gpr/<target>
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 <schonberg@adacore.com>
* 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 <brosgol@adacore.com>
* gnat_rm.texi: Document Short_Descriptors.
2010-09-10 Arnaud Charlet <charlet@adacore.com>
* 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
Diffstat (limited to 'gcc/ada/prj-ext.adb')
| -rw-r--r-- | gcc/ada/prj-ext.adb | 12 |
1 files changed, 10 insertions, 2 deletions
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 |