diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-08-02 15:29:08 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-08-02 15:29:08 +0200 |
| commit | d2d9cc2290489f4ebbcf86544b806f0cd7fb59f2 (patch) | |
| tree | d0f9653bdcece87e55a5dc4212df8a0f1aaa4fcc /gcc/ada/make.adb | |
| parent | c32d4bcf4a1a99704c542114daea0b08efc76ecc (diff) | |
| download | gcc-d2d9cc2290489f4ebbcf86544b806f0cd7fb59f2.zip gcc-d2d9cc2290489f4ebbcf86544b806f0cd7fb59f2.tar.gz gcc-d2d9cc2290489f4ebbcf86544b806f0cd7fb59f2.tar.bz2 | |
[multiple changes]
2011-08-02 Robert Dewar <dewar@adacore.com>
* exp_ch3.adb: Minor comment additions.
* sem_ch13.adb: Minor reformatting.
2011-08-02 Arnaud Charlet <charlet@adacore.com>
* exp_pakd.adb (Expand_Packed_Element_Reference): Revert previous change
2011-08-02 Pascal Obry <obry@adacore.com>
* make.adb, makeutl.adb: Removes some superfluous directory separator.
From-SVN: r177150
Diffstat (limited to 'gcc/ada/make.adb')
| -rw-r--r-- | gcc/ada/make.adb | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb index 5fe7c74..d1fec921 100644 --- a/gcc/ada/make.adb +++ b/gcc/ada/make.adb @@ -3826,14 +3826,7 @@ package body Make is Get_Name_String (Project.Directory.Display_Name); begin - if Parent_Directory (Parent_Directory'Last) = - Directory_Separator - then - return Parent_Directory & Path_Name; - - else - return Parent_Directory & Directory_Separator & Path_Name; - end if; + return Parent_Directory & Path_Name; end; end if; end; @@ -5203,13 +5196,6 @@ package body Make is if not Is_Absolute_Path (Exec_File_Name) then Get_Name_String (Main_Project.Exec_Directory.Display_Name); - - if not - Is_Directory_Separator (Name_Buffer (Name_Len)) - then - Add_Char_To_Name_Buffer (Directory_Separator); - end if; - Add_Str_To_Name_Buffer (Exec_File_Name); Saved_Linker_Switches.Table (J + 1) := new String'(Name_Buffer (1 .. Name_Len)); @@ -5458,11 +5444,6 @@ package body Make is begin if not Is_Absolute_Path (Exec_File_Name) then Get_Name_String (Main_Project.Exec_Directory.Display_Name); - - if Name_Buffer (Name_Len) /= Directory_Separator then - Add_Char_To_Name_Buffer (Directory_Separator); - end if; - Add_Str_To_Name_Buffer (Exec_File_Name); Executable := Name_Find; end if; @@ -6074,7 +6055,6 @@ package body Make is (Get_Name_String (Library_Projs.Table (Index).Library_Dir.Display_Name) & - Directory_Separator & "lib" & Get_Name_String (Library_Projs.Table (Index). Library_Name) & |