trunk/gcc120/vcs_diff_compiler.patch results

File details

./trunk/gcc120/vcs_diff_compiler.patch 2025-12-03-01:12

Used binaries

Binaries version

> uname -a
Linux cfarm120 5.14.0-427.31.1.el9_4.ppc64le #1 SMP Thu Aug 15 11:21:31 PDT 2024 ppc64le ppc64le ppc64le GNU/Linux

Full file content

 
diff --cc compiler/utils/vppcx64.pp
index 741c25fa92,68ba800f34..0000000000
--- a/compiler/utils/vppcx64.pp
+++ b/compiler/utils/vppcx64.pp
@@@ -131,6 -131,9 +131,12 @@@ begi
      FullCompilerName:=Dir+CompilerName
    else
      FullCompilerName:=filesearch(CompilerName,Dir+PathSep+GetEnvironmentVariable('PATH'));
++<<<<<<< HEAD
++=======
+ 
+   if FullCompilerName=CompilerName then
+     FullCompilerName:=Dir+CompilerName;
++>>>>>>> d9073fd11d (Check if executable exists in same directory using FileExists)
  
    if FullCompilerName='' then
      begin
* Unmerged path compiler/utils/vppcx64.pp