paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-04 20:36:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

fpmake: Do not pass the path of packages the package depends on to the unit-search-path in fpmake.pp files

Browse Source 
git-svn-id: trunk@47284 -
This commit is contained in:
joost 2015-01-02 20:43:17 +00:00
parent dd443bdb8b
commit a8c4670acb
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packager/packagesystem.pas
View File

@ -4382,7 +4382,6 @@ var
e: string; e: string;
SrcFilename: String; SrcFilename: String;
FpmakeFPCFilename: String; FpmakeFPCFilename: String;
UnitOutputPath: String;
UnitPath: String; UnitPath: String;
CodeBuffer: TCodeBuffer; CodeBuffer: TCodeBuffer;
MainSrcFile: String; MainSrcFile: String;
@ -4409,12 +4408,13 @@ begin
FPmakeCompiledFilename:=AppendPathDelim(APackage.Directory)+APackage.Name+'.compiled'; FPmakeCompiledFilename:=AppendPathDelim(APackage.Directory)+APackage.Name+'.compiled';
SrcFilename:=APackage.GetSrcFilename; SrcFilename:=APackage.GetSrcFilename;
UnitPath:=APackage.CompilerOptions.GetUnitPath(true,
coptParsedPlatformIndependent); UnitPath:=APackage.CompilerOptions.ParsedOpts.GetParsedPIValue(pcosUnitPath);
UnitPath:=CreateRelativeSearchPath(UnitPath,APackage.CompilerOptions.BaseDirectory);
UnitPath:=MergeSearchPaths(UnitPath, '.');
IncPath:=APackage.CompilerOptions.GetIncludePath(true, IncPath:=APackage.CompilerOptions.GetIncludePath(true,
coptParsedPlatformIndependent,false); coptParsedPlatformIndependent,false);
UnitOutputPath:=APackage.CompilerOptions.GetUnitOutPath(true,
coptParsedPlatformIndependent);
CustomOptions:=APackage.CompilerOptions.GetCustomOptions( CustomOptions:=APackage.CompilerOptions.GetCustomOptions(
coptParsedPlatformIndependent); coptParsedPlatformIndependent);
debugln('CustomOptions (orig): ',CustomOptions); debugln('CustomOptions (orig): ',CustomOptions);
@ -4431,8 +4431,6 @@ begin
UnitPath:=ConvertLazarusToFpmakeSearchPath(UnitPath); UnitPath:=ConvertLazarusToFpmakeSearchPath(UnitPath);
IncPath:=ConvertLazarusToFpmakeSearchPath(IncPath); IncPath:=ConvertLazarusToFpmakeSearchPath(IncPath);
// remove path delimiter at the end, or else it will fail on windows // remove path delimiter at the end, or else it will fail on windows
UnitOutputPath:=ConvertLazarusToMakefileDirectory(
ChompPathDelim(UnitOutputPath));
MainSrcFile:=CreateRelativePath(SrcFilename,APackage.Directory); MainSrcFile:=CreateRelativePath(SrcFilename,APackage.Directory);
CustomOptions:=ConvertLazarusOptionsToFpmakeOptions(CustomOptions); CustomOptions:=ConvertLazarusOptionsToFpmakeOptions(CustomOptions);
debugln('CustomOptions (fpmake format): ',CustomOptions); debugln('CustomOptions (fpmake format): ',CustomOptions);