diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-09-09 14:46:27 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-09-09 14:46:27 +0200 |
| commit | 8cce3d7579f87245302f6ceae1b33412558da1c0 (patch) | |
| tree | 95d004c63d3883e1949ae823996d9c6caeea7d2a /gcc/ada/prj.adb | |
| parent | e6a96e55f310e7221bf2c183a746cfe1746a97c9 (diff) | |
| download | gcc-8cce3d7579f87245302f6ceae1b33412558da1c0.zip gcc-8cce3d7579f87245302f6ceae1b33412558da1c0.tar.gz gcc-8cce3d7579f87245302f6ceae1b33412558da1c0.tar.bz2 | |
[multiple changes]
2010-09-09 Robert Dewar <dewar@adacore.com>
* sem_attr.adb: Minor reformatting.
2010-09-09 Thomas Quinot <quinot@adacore.com>
* socket.c (__gnat_socket_ioctl): On Darwin, the req parameter is an
unsigned long, not an int.
2010-09-09 Vincent Celier <celier@adacore.com>
* make.adb, mlib-prj.adb, prj.adb, prj-nmsc.adb, mlib-tgt.adb,
prj-conf.adb, prj-env.adb: Use Display_Name instead of Name whenever
we are not checking for equality of path or file names.
2010-09-09 Ed Schonberg <schonberg@adacore.com>
* exp_util.adb (Remove_Side_Effects): If the expression is a packed
array reference, reset the Analyzed flag so that it is properly
expanded when the resulting object declaration is analyzed.
2010-09-09 Vincent Celier <celier@adacore.com>
* sinput-p.adb (Source_File_Is_Subunit): Return False if X is
No_Source_File.
2010-09-09 Ramon Fernandez <fernandez@adacore.com>
* sysdep.c: The wrSbc8548 BSP in MILS doesn't know anything about the
VX_SPE_TASK option, so disable it.
From-SVN: r164084
Diffstat (limited to 'gcc/ada/prj.adb')
| -rw-r--r-- | gcc/ada/prj.adb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/ada/prj.adb b/gcc/ada/prj.adb index 59acced..e0f9937 100644 --- a/gcc/ada/prj.adb +++ b/gcc/ada/prj.adb @@ -1015,11 +1015,11 @@ package body Prj is if Project.Library then if Project.Object_Directory = No_Path_Information - or else Contains_ALI_Files (Project.Library_ALI_Dir.Name) + or else Contains_ALI_Files (Project.Library_ALI_Dir.Display_Name) then - return Project.Library_ALI_Dir.Name; + return Project.Library_ALI_Dir.Display_Name; else - return Project.Object_Directory.Name; + return Project.Object_Directory.Display_Name; end if; -- For a non-library project, add object directory if it is not a |