Sfoglia il codice sorgente

* Only pass repositories with _installed_ packages to fpmake

git-svn-id: trunk@34640 -
joost 8 anni fa
parent
commit
350ca0063e
1 ha cambiato i file con 9 aggiunte e 3 eliminazioni
  1. 9 3
      packages/fppkg/src/pkgfpmake.pp

+ 9 - 3
packages/fppkg/src/pkgfpmake.pp

@@ -358,10 +358,16 @@ begin
       CondAddOption('--baseinstalldir',InstallRepo.DefaultPackagesStructure.GetBaseInstallDir);
     end;
 
-  for i := GFPpkg.Options.SectionList.Count -1 downto 0 do
+  for i := GFPpkg.RepositoryList.Count-1 downto 0 do
     begin
-      if GFPpkg.Options.SectionList[ i ] is TFppkgRepositoryOptionSection then
-        CondAddOption('--searchpath', TFppkgRepositoryOptionSection(GFPpkg.Options.SectionList[ i ]).Path);
+      if GFPpkg.RepositoryList[i] is TFPRepository then
+        begin
+          InstallRepo := TFPRepository(GFPpkg.RepositoryList[i]);
+          if (InstallRepo.RepositoryType = fprtInstalled) and Assigned(InstallRepo.DefaultPackagesStructure) then
+            begin
+              CondAddOption('--searchpath', InstallRepo.DefaultPackagesStructure.GetBaseInstallDir);
+            end;
+        end;
     end;
 
   { Run FPMake }