Browse Source

* Determine if a 8.3-target-string should be used based on host-os, not the target-os, since the Makefiles and compiler do the same.

git-svn-id: trunk@28951 -
joost 10 years ago
parent
commit
c4492a711f
1 changed files with 2 additions and 2 deletions
  1. 2 2
      packages/fpmkunit/src/fpmkunit.pp

+ 2 - 2
packages/fpmkunit/src/fpmkunit.pp

@@ -2123,7 +2123,7 @@ end;
 Function MakeTargetString(CPU : TCPU;OS: TOS) : String;
 Function MakeTargetString(CPU : TCPU;OS: TOS) : String;
 
 
 begin
 begin
-  if OS in AllLimit83fsOses then
+  if Defaults.BuildOS in AllLimit83fsOses then
     Result := OSToString(OS)
     Result := OSToString(OS)
   else
   else
     Result:=CPUToString(CPU)+'-'+OSToString(OS);
     Result:=CPUToString(CPU)+'-'+OSToString(OS);
@@ -6408,7 +6408,7 @@ begin
     if APackage.BuildMode=bmBuildUnit then
     if APackage.BuildMode=bmBuildUnit then
       begin
       begin
         APackage.FBUTargets := TTargets.Create(TTarget);
         APackage.FBUTargets := TTargets.Create(TTarget);
-        if Defaults.OS in AllLimit83fsOses then
+        if Defaults.BuildOS in AllLimit83fsOses then
           BUName := 'BUnit.pp'
           BUName := 'BUnit.pp'
         else
         else
           BUName := 'BuildUnit_'+StringReplace(APackage.Name,'-','_',[rfReplaceAll])+'.pp';
           BUName := 'BuildUnit_'+StringReplace(APackage.Name,'-','_',[rfReplaceAll])+'.pp';