diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-06-16 08:43:43 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-06-16 08:43:43 +0000 |
| commit | 77d8e5297557d9f3e02a65c01d6179cd55d00f6c (patch) | |
| tree | 0ca065989fe67b3b08dbc86971812b71c5d761ce /gcc/ada | |
| parent | 0bba2a3eedb2689450ece1d2a9e50aca24fc7409 (diff) | |
| download | gcc-77d8e5297557d9f3e02a65c01d6179cd55d00f6c.tar.gz | |
2005-06-14 Vincent Celier <celier@adacore.com>
* osint.adb (Add_Default_Search_Dirs): Put source and object
directories of project files before directories coming from
ADA_INCLUDE_PATH and ADA_OBJECTS_PATH.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@101050 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/osint.adb | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/gcc/ada/osint.adb b/gcc/ada/osint.adb index 0b6a238aaba..5678a63b310 100644 --- a/gcc/ada/osint.adb +++ b/gcc/ada/osint.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2004 Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2005 Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -314,7 +314,7 @@ package body Osint is -- For the call to Close begin - -- Construct a C compatible character string buffer. + -- Construct a C compatible character string buffer Buffer (1 .. Buffer'Last - 1) := Path_File_Name.all; Buffer (Buffer'Last) := ASCII.NUL; @@ -409,6 +409,20 @@ package body Osint is -- environment variable. Get this value, extract the directory names -- and store in the tables. + -- Check for eventual project path file env vars + + Path_File_Name := Getenv (Project_Include_Path_File); + + if Path_File_Name'Length > 0 then + Get_Dirs_From_File (Additional_Source_Dir => True); + end if; + + Path_File_Name := Getenv (Project_Objects_Path_File); + + if Path_File_Name'Length > 0 then + Get_Dirs_From_File (Additional_Source_Dir => False); + end if; + -- On VMS, don't expand the logical name (e.g. environment variable), -- just put it into Unix (e.g. canonical) format. System services -- will handle the expansion as part of the file processing. @@ -443,21 +457,7 @@ package body Osint is end loop; end loop; - -- Check for eventual project path file env vars - - Path_File_Name := Getenv (Project_Include_Path_File); - - if Path_File_Name'Length > 0 then - Get_Dirs_From_File (Additional_Source_Dir => True); - end if; - - Path_File_Name := Getenv (Project_Objects_Path_File); - - if Path_File_Name'Length > 0 then - Get_Dirs_From_File (Additional_Source_Dir => False); - end if; - - -- For the compiler, if --RTS= was apecified, add the runtime + -- For the compiler, if --RTS= was specified, add the runtime -- directories. if RTS_Src_Path_Name /= null and then |