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

morphos/amiga/atari: fixed making vlink default based on the host platform

Browse Source 
git-svn-id: trunk@36486 -
This commit is contained in:
Károly Balogh 2017-06-11 23:33:11 +00:00
parent 3deb3fb03b
commit 177a571af8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/options.pas
View File

@ -56,6 +56,7 @@ Type
paratargetasm : tasm; paratargetasm : tasm;
paratargetdbg : tdbg; paratargetdbg : tdbg;
LinkTypeSetExplicitly : boolean; LinkTypeSetExplicitly : boolean;
LinkerSetExplicitly : boolean;
Constructor Create; Constructor Create;
Destructor Destroy;override; Destructor Destroy;override;
procedure WriteLogo; procedure WriteLogo;
@ -2597,6 +2598,7 @@ begin
include(init_settings.globalswitches,cs_link_vlink); include(init_settings.globalswitches,cs_link_vlink);
include(init_settings.globalswitches,cs_link_extern); include(init_settings.globalswitches,cs_link_extern);
end; end;
LinkerSetExplicitly:=true;
end; end;
'X' : 'X' :
begin begin
@ -3150,8 +3152,9 @@ begin
{$if defined(atari) or defined(hasamiga)} {$if defined(atari) or defined(hasamiga)}
{ enable vlink as default linker on Atari, Amiga, and MorphOS, but not for cross compilers (for now) } { enable vlink as default linker on Atari, Amiga, and MorphOS, but not for cross compilers (for now) }
if target_info.system in [system_m68k_amiga,system_m68k_atari, if (target_info.system in [system_m68k_amiga,system_m68k_atari,
system_powerpc_amiga,system_powerpc_morphos] then system_powerpc_amiga,system_powerpc_morphos]) and
not LinkerSetExplicitly then
include(init_settings.globalswitches,cs_link_vlink); include(init_settings.globalswitches,cs_link_vlink);
{$endif} {$endif}
end; end;
@ -3236,6 +3239,7 @@ begin
paratargetasm:=as_none; paratargetasm:=as_none;
paratargetdbg:=dbg_none; paratargetdbg:=dbg_none;
LinkTypeSetExplicitly:=false; LinkTypeSetExplicitly:=false;
LinkerSetExplicitly:=false;
end; end;