paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 14:09:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed group() writing

Browse Source
This commit is contained in:
peter 2000-01-12 10:31:45 +00:00
parent 0e4c33391c
commit 83c82663f2
1 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
compiler/t_win32.pas
View File

@ -681,6 +681,7 @@ begin
if s<>'' then if s<>'' then
LinkRes.AddFileName(GetShortName(s)); LinkRes.AddFileName(GetShortName(s));
end; end;
LinkRes.Add(')');
{ Write staticlibraries } { Write staticlibraries }
if not StaticLibFiles.Empty then if not StaticLibFiles.Empty then
@ -696,28 +697,31 @@ begin
{ Write sharedlibraries like -l<lib>, also add the needed dynamic linker { Write sharedlibraries like -l<lib>, also add the needed dynamic linker
here to be sure that it gets linked this is needed for glibc2 systems (PFV) } here to be sure that it gets linked this is needed for glibc2 systems (PFV) }
linklibc:=false; if not SharedLibFiles.Empty then
While not SharedLibFiles.Empty do
begin begin
S:=SharedLibFiles.Get; linklibc:=false;
if s<>'c' then LinkRes.Add('INPUT(');
While not SharedLibFiles.Empty do
begin begin
i:=Pos(target_os.sharedlibext,S); S:=SharedLibFiles.Get;
if i>0 then if s<>'c' then
Delete(S,i,255); begin
LinkRes.Add('-l'+s); i:=Pos(target_os.sharedlibext,S);
end if i>0 then
else Delete(S,i,255);
begin LinkRes.Add('-l'+s);
LinkRes.Add('-l'+s); end
linklibc:=true; else
begin
LinkRes.Add('-l'+s);
linklibc:=true;
end;
end; end;
{ be sure that libc is the last lib }
if linklibc then
LinkRes.Add('-lc');
LinkRes.Add(')');
end; end;
{ be sure that libc is the last lib }
if linklibc then
LinkRes.Add('-lc');
LinkRes.Add(')');
{ Write and Close response } { Write and Close response }
linkres.writetodisk; linkres.writetodisk;
linkres.done; linkres.done;
@ -1079,7 +1083,10 @@ end;
end. end.
{ {
$Log$ $Log$
Revision 1.17 2000-01-11 09:52:07 peter Revision 1.18 2000-01-12 10:31:45 peter
* fixed group() writing
Revision 1.17 2000/01/11 09:52:07 peter
* fixed placing of .sl directories * fixed placing of .sl directories
* use -b again for base-file selection * use -b again for base-file selection
* fixed group writing for linux with smartlinking * fixed group writing for linux with smartlinking
@ -1146,4 +1153,4 @@ end.
* redesigned linker object * redesigned linker object
+ library support for linux (only procedures can be exported) + library support for linux (only procedures can be exported)
} }