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

* fixed ordering of object and libraries

Browse Source
This commit is contained in:
peter 2001-08-13 19:26:03 +00:00
parent 61020cd424
commit 38770359fe
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/link.pas
View File

@ -314,7 +314,7 @@ end;
Procedure TLinker.AddObject(const S,unitpath : String); Procedure TLinker.AddObject(const S,unitpath : String);
begin begin
ObjectFiles.Insert(FindObjectFile(s,unitpath)); ObjectFiles.Concat(FindObjectFile(s,unitpath));
end; end;
@ -328,8 +328,8 @@ begin
{ remove extension if any } { remove extension if any }
if Copy(s,length(s)-length(target_info.sharedlibext)+1,length(target_info.sharedlibext))=target_info.sharedlibext then if Copy(s,length(s)-length(target_info.sharedlibext)+1,length(target_info.sharedlibext))=target_info.sharedlibext then
Delete(s,length(s)-length(target_info.sharedlibext)+1,length(target_info.sharedlibext)+1); Delete(s,length(s)-length(target_info.sharedlibext)+1,length(target_info.sharedlibext)+1);
{ ready to be inserted } { ready to be added }
SharedLibFiles.Insert (S); SharedLibFiles.Concat(S);
end; end;
@ -343,7 +343,7 @@ begin
ns:=FindLibraryFile(s,target_info.staticlibext,found); ns:=FindLibraryFile(s,target_info.staticlibext,found);
if not(cs_link_extern in aktglobalswitches) and (not found) then if not(cs_link_extern in aktglobalswitches) and (not found) then
Message1(exec_w_libfile_not_found,s); Message1(exec_w_libfile_not_found,s);
StaticLibFiles.Insert(ns); StaticLibFiles.Concat(ns);
end; end;
@ -482,7 +482,10 @@ initialization
end. end.
{ {
$Log$ $Log$
Revision 1.19 2001-08-07 18:47:12 peter Revision 1.20 2001-08-13 19:26:03 peter
* fixed ordering of object and libraries
Revision 1.19 2001/08/07 18:47:12 peter
* merged netbsd start * merged netbsd start
* profile for win32 * profile for win32