diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-09-10 09:45:27 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-09-10 09:45:27 +0000 |
| commit | 784d42309d8b27fd886ee74b8b6a6111ec60b85c (patch) | |
| tree | 20e2d444c0696d09f6e8ef992b4bc959dce87426 /gcc/ada/prj-util.adb | |
| parent | 817713aee588e7b82e2997e6c82c2947a2eb27d6 (diff) | |
| download | gcc-784d42309d8b27fd886ee74b8b6a6111ec60b85c.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@164149 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/prj-util.adb')
| -rw-r--r-- | gcc/ada/prj-util.adb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gcc/ada/prj-util.adb b/gcc/ada/prj-util.adb index 62e6e6ddd1e..7700b8ec19f 100644 --- a/gcc/ada/prj-util.adb +++ b/gcc/ada/prj-util.adb @@ -187,7 +187,7 @@ package body Prj.Util is Executable_Extension_On_Target := Saved_EEOT; return Result; - else + elsif Builder_Package /= No_Package then -- We still want to take into account cases where the suffix is -- specified in the project itself, as opposed to the config file. -- Unfortunately, when the project was processed, they are both @@ -208,11 +208,10 @@ package body Prj.Util is Result := Executable_Name (File); Executable_Extension_On_Target := Saved_EEOT; return Result; - - else - return File; end if; end if; + + return File; end Add_Suffix; -- Start of processing for Executable_Of |