paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-07-08 19:15:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

* also check in the same dir as the unit we are loading from, this

Browse Source 
makes UNITPATH working better
This commit is contained in:
peter 2004-01-22 17:23:56 +00:00
parent fda73956a2
commit cbbfb018f1
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compiler/fppu.pas
View File

@ -325,8 +325,9 @@ uses
2. look for ppu in outputpath if set, this is tp7 compatible (PFV) 2. look for ppu in outputpath if set, this is tp7 compatible (PFV)
3. look for the specified source file (from the uses line) 3. look for the specified source file (from the uses line)
4. look for source in cwd 4. look for source in cwd
5. local unit pathlist 5. look in same path as local unit
6. global unit pathlist } 6. local unit pathlist
7. global unit pathlist }
fnd:=false; fnd:=false;
if not onlysource then if not onlysource then
begin begin
@ -358,7 +359,13 @@ uses
if not fnd then if not fnd then
fnd:=SourceSearchPath('.'); fnd:=SourceSearchPath('.');
if (not fnd) and Assigned(Loaded_From) then if (not fnd) and Assigned(Loaded_From) then
fnd:=SearchPathList(Loaded_From.LocalUnitSearchPath); begin
fnd:=PPUSearchPath(Loaded_From.Path^);
if not fnd then
fnd:=SourceSearchPath(Loaded_From.Path^);
if not fnd then
fnd:=SearchPathList(Loaded_From.LocalUnitSearchPath);
end;
if not fnd then if not fnd then
fnd:=SearchPathList(UnitSearchPath); fnd:=SearchPathList(UnitSearchPath);
@ -1507,7 +1514,11 @@ uses
end. end.
{ {
$Log$ $Log$
Revision 1.49 2003-12-22 22:15:43 peter Revision 1.50 2004-01-22 17:23:56 peter
* also check in the same dir as the unit we are loading from, this
makes UNITPATH working better
Revision 1.49 2003/12/22 22:15:43 peter
* deref implementation after implementation units are loaded and * deref implementation after implementation units are loaded and
numbered numbered