Browse Source

* Make distclean should clean up for all known targets. This behavior waw broken since r18060

git-svn-id: trunk@22980 -
joost 12 years ago
parent
commit
1698673744
1 changed files with 8 additions and 4 deletions
  1. 8 4
      packages/fpmkunit/src/fpmkunit.pp

+ 8 - 4
packages/fpmkunit/src/fpmkunit.pp

@@ -6227,8 +6227,8 @@ end;
 
 procedure TBuildEngine.Clean(APackage: TPackage; AllTargets: boolean);
 var
-//  ACPU: TCpu;
-//  AOS: TOS;
+  ACPU: TCpu;
+  AOS: TOS;
   DirectoryList : TStringList;
 begin
   Log(vlInfo,SInfoCleaningPackage,[APackage.Name]);
@@ -6242,8 +6242,12 @@ begin
         // being renamed and such. See also bug 19655
         DirectoryList := TStringList.Create;
         try
-          DirectoryList.Add(ExtractFileDir(APackage.GetUnitsOutputDir(Defaults.CPU,Defaults.OS)));
-          DirectoryList.Add(ExtractFileDir(APackage.GetBinOutputDir(Defaults.CPU,Defaults.OS)));
+          for ACPU:=low(TCpu) to high(TCpu) do
+            for AOS:=low(TOS) to high(TOS) do
+              begin
+                DirectoryList.Add(ExtractFileDir(APackage.GetUnitsOutputDir(ACPU,AOS)));
+                DirectoryList.Add(ExtractFileDir(APackage.GetBinOutputDir(ACPU,AOS)));
+              end;
           CmdRemoveTrees(DirectoryList);
         finally
           DirectoryList.Free;