瀏覽代碼

* always use ppc<targetcpu> instead of ppcross<targetcpu> on darwin,
because due to the mach-o executable format which can contain
binaries for different architectures in a single file, different
names for native and cross compilers are not used on Mac OS X
(mantis #10067)

git-svn-id: trunk@10270 -

Jonas Maebe 17 年之前
父節點
當前提交
a497aec91d
共有 1 個文件被更改,包括 9 次插入0 次删除
  1. 9 0
      compiler/utils/fpc.pp

+ 9 - 0
compiler/utils/fpc.pp

@@ -214,7 +214,16 @@ program fpc;
                            else
                            else
                              error('Illegal processor type "'+processorstr+'"');
                              error('Illegal processor type "'+processorstr+'"');
 
 
+{$ifndef darwin}
                            ppcbin:='ppcross'+cpusuffix;
                            ppcbin:='ppcross'+cpusuffix;
+{$else not darwin}
+                           { the mach-o format supports "fat" binaries whereby }
+                           { a single executable contains machine code for     }
+                           { several architectures -> it is counter-intuitive  }
+                           { and non-standard to use different binary names    }
+                           { for cross-compilers vs. native compilers          }
+                           ppcbin:='ppc'+cpusuffix;
+{$endif not darwin}
                          end;
                          end;
                  end
                  end
               else if pos('-Xp',s)=1 then
               else if pos('-Xp',s)=1 then