paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-28 05:41:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Fix position of fpcmade file for rtl

Browse Source 
git-svn-id: trunk@14092 -
This commit is contained in:
pierre 2009-11-07 01:01:31 +00:00
parent 2b879fcb54
commit e7b25e55c0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
utils/fpcm/fpcmwr.pp
View File

@ -522,6 +522,7 @@ implementation
procedure AddPackage(const pack,prefix:string); procedure AddPackage(const pack,prefix:string);
var var
packdirvar,unitdirvar : string; packdirvar,unitdirvar : string;
fpcmadedirvar : string;
begin begin
FOutput.Add('ifdef '+Prefix+VarName(pack)); FOutput.Add('ifdef '+Prefix+VarName(pack));
{ create needed variables } { create needed variables }
@ -537,9 +538,14 @@ implementation
FOutput.Add(unitdirvar+'=$('+packdirvar+')'); FOutput.Add(unitdirvar+'=$('+packdirvar+')');
FOutput.Add('endif'); FOutput.Add('endif');
FOutput.Add('ifdef CHECKDEPEND'); FOutput.Add('ifdef CHECKDEPEND');
FOutput.Add('$('+packdirvar+')/$(FPCMADE):'); { rtl needs special handling for FPCMADE }
FOutput.Add(#9'$(MAKE) -C $('+packdirvar+') $(FPCMADE)'); if pack='rtl' then
FOutput.Add('override ALLDEPENDENCIES+=$('+packdirvar+')/$(FPCMADE)'); fpcmadedirvar:='/$(OS_TARGET)'
else
fpcmadedirvar:='';
FOutput.Add('$('+packdirvar+')'+fpcmadedirvar+'/$(FPCMADE):');
FOutput.Add(#9'$(MAKE) -C $('+packdirvar+')'+fpcmadedirvar+' $(FPCMADE)');
FOutput.Add('override ALLDEPENDENCIES+=$('+packdirvar+')'+fpcmadedirvar+'/$(FPCMADE)');
FOutput.Add('endif'); FOutput.Add('endif');
{ Package dir doesn't exists, check unit dir } { Package dir doesn't exists, check unit dir }
FOutput.Add('else'); FOutput.Add('else');