Explorar o código

* fix (hopefully) build without an ld.bfd variant

florian %!s(int64=2) %!d(string=hai) anos
pai
achega
708aaa7b97
Modificáronse 3 ficheiros con 5 adicións e 5 borrados
  1. 3 3
      compiler/link.pas
  2. 1 1
      compiler/systems/t_android.pas
  3. 1 1
      compiler/systems/t_linux.pas

+ 3 - 3
compiler/link.pas

@@ -88,7 +88,7 @@ interface
          Info : TLinkerInfo;
          Constructor Create;override;
          Destructor Destroy;override;
-         Function  FindUtil(const s:TCmdStr):TCmdStr;
+         Function  FindUtil(const s:TCmdStr;throwerror: boolean=true):TCmdStr;
          Function  CatFileContent(para:TCmdStr):TCmdStr;
          Function  DoExec(const command:TCmdStr; para:TCmdStr;showinfo,useshell:boolean):boolean;
          procedure SetDefaultInfo;virtual;
@@ -812,7 +812,7 @@ Implementation
       end;
 
 
-    Function TExternalLinker.FindUtil(const s:TCmdStr):TCmdStr;
+    Function TExternalLinker.FindUtil(const s:TCmdStr;throwerror: boolean=true):TCmdStr;
       var
         Found    : boolean;
         FoundBin : TCmdStr;
@@ -841,7 +841,7 @@ Implementation
          Found:=FindFile(utilexe,utilsdirectory,false,Foundbin);
         if (not Found) then
          Found:=FindExe(utilexe,false,Foundbin);
-        if (not Found) and not(cs_link_nolink in current_settings.globalswitches) then
+        if throwerror and (not Found) and not(cs_link_nolink in current_settings.globalswitches) then
          begin
            Message1(exec_e_util_not_found,utilexe);
            current_settings.globalswitches:=current_settings.globalswitches+[cs_link_nolink];

+ 1 - 1
compiler/systems/t_android.pas

@@ -440,7 +440,7 @@ begin
   s:=utilsprefix+binstr+'.bfd';
   if (source_info.exeext<>'') then
     s:=s+source_info.exeext;
-  s:=FindUtil(s);
+  s:=FindUtil(s,false);
   if FileExists(s, True) then
     binstr:=s
   else

+ 1 - 1
compiler/systems/t_linux.pas

@@ -832,7 +832,7 @@ begin
   if cs_large in current_settings.globalswitches then
     cmdstr:=cmdstr+' --no-relax';
 
-  s:=FindUtil(utilsprefix+BinStr+'.bfd');
+  s:=FindUtil(utilsprefix+BinStr+'.bfd',false);
   if FileExists(s, True) then
     binstr:=s
   else