paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-12-16 02:50:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

* merged

Browse Source
This commit is contained in:
peter 1999-06-15 13:57:31 +00:00
parent 081a7283c0
commit 867f6364dd
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compiler/link.pas
View File

@ -109,13 +109,14 @@ begin
if FileExists(DynamicLinker) then
begin
Glibc2:=true;
{ also glibc 2.1 ?}
if FileExists('/lib/ld-2.1.1.so') then
{ also glibc 2.1 / 2.1.1 ? }
if FileExists('/lib/ld-2.1.so') or
FileExists('/lib/ld-2.1.1.so') then
Glibc21:=true;
end
else
DynamicLinker:='/lib/ld-linux.so.1';
LibrarySearchPath:='/lib;/usr/lib;/usr/lib/X11';
LibrarySearchPath:='/lib;/usr/lib;/usr/X11R6/lib';
{$else}
DynamicLinker:='';
LibrarySearchPath:='';
@ -644,7 +645,13 @@ end;
end.
{
$Log$
Revision 1.54 1999-06-02 13:25:35 hajny
Revision 1.55 1999-06-15 13:57:31 peter
* merged
Revision 1.54.2.1 1999/06/15 13:51:56 peter
* also check ld-2.1.so for glibc 2.1, previous was only for 2.1.1
Revision 1.54 1999/06/02 13:25:35 hajny
* fixed stripping symbols for OS/2
Revision 1.53 1999/05/04 21:44:44 florian

11
compiler/pmodules.pas
View File

@ -59,8 +59,7 @@ unit pmodules;
if (cs_create_sharedlib in aktmoduleswitches) then
Linker.MakeSharedLibrary
else
if (cs_create_staticlib in aktmoduleswitches) or
((cs_smartlink in aktmoduleswitches) and target_asm.needar) then
if (cs_smartlink in aktmoduleswitches) and target_asm.needar then
Linker.MakeStaticLibrary(SmartLinkFilesCnt);
end;
@ -1336,7 +1335,13 @@ unit pmodules;
end.
{
$Log$
Revision 1.124 1999-05-27 19:44:48 peter
Revision 1.125 1999-06-15 13:57:32 peter
* merged
Revision 1.124.2.1 1999/06/15 13:54:26 peter
* don't run ar anymore for binary writer, also not with -CS
Revision 1.124 1999/05/27 19:44:48 peter
* removed oldasm
* plabel -> pasmlabel
* -a switches to source writing automaticly