paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-13 23:59:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Only add gdbver.inc if needed

Browse Source 
git-svn-id: trunk@29154 -
This commit is contained in:
pierre 2014-11-26 15:22:24 +00:00
parent c6199b22b6
commit 8ea4e575f2
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/gdbint/fpmake.pp
View File

@ -16,7 +16,7 @@ var
P : TPackage; P : TPackage;
GdbLibDir, GdbLibFile: string; GdbLibDir, GdbLibFile: string;
GdbLibFound: boolean; GdbLibFound: boolean;
GdbVerTarget: TTarget; GdbintTarget, GdbVerTarget: TTarget;
begin begin
P := Sender as TPackage; P := Sender as TPackage;
// Search for a libgdb file. // Search for a libgdb file.
@ -60,6 +60,7 @@ begin
end; end;
GdbVerTarget:=TTarget(p.Targets.ItemByName('gdbver')); GdbVerTarget:=TTarget(p.Targets.ItemByName('gdbver'));
GdbintTarget:=TTarget(p.Targets.ItemByName('gdbint'));
if GdbLibFound then if GdbLibFound then
Installer.BuildEngine.Log(vlCommand,'File libgdb.a found ('+GdbLibFile+')') Installer.BuildEngine.Log(vlCommand,'File libgdb.a found ('+GdbLibFile+')')
@ -94,6 +95,8 @@ begin
AddProgramExtension('gdbver',Defaults.BuildOS),'-o ' + AddProgramExtension('gdbver',Defaults.BuildOS),'-o ' +
Installer.BuildEngine.AddPathPrefix(p,'src'+PathDelim+'gdbver.inc')); Installer.BuildEngine.AddPathPrefix(p,'src'+PathDelim+'gdbver.inc'));
with GdbintTarget.Dependencies do
AddInclude('gdbver.inc');
// Pass -dUSE_MINGW_GDB to the compiler when a MinGW gdb is used // Pass -dUSE_MINGW_GDB to the compiler when a MinGW gdb is used
if FileExists(GdbLibDir+PathDelim+MinGWGdbLibName) then if FileExists(GdbLibDir+PathDelim+MinGWGdbLibName) then
begin begin
@ -119,6 +122,8 @@ begin
else else
L.values['src'+DirectorySeparator+'gdbver_nogdb.inc'] := 'src'+DirectorySeparator+'gdbver.inc'; L.values['src'+DirectorySeparator+'gdbver_nogdb.inc'] := 'src'+DirectorySeparator+'gdbver.inc';
Installer.BuildEngine.cmdcopyfiles(L, Installer.BuildEngine.StartDir, nil); Installer.BuildEngine.cmdcopyfiles(L, Installer.BuildEngine.StartDir, nil);
with GdbintTarget.Dependencies do
AddInclude('gdbver.inc');
finally finally
L.Free; L.Free;
end; end;
@ -181,10 +186,6 @@ begin
AddUnit('gdbint'); AddUnit('gdbint');
end; end;
T:=P.Targets.AddUnit('gdbint.pp'); T:=P.Targets.AddUnit('gdbint.pp');
with T.Dependencies do
begin
AddInclude('gdbver.inc');
end;
P.ExamplePath.add('examples'); P.ExamplePath.add('examples');
P.Targets.AddExampleProgram('testgdb.pp'); P.Targets.AddExampleProgram('testgdb.pp');
P.Targets.AddExampleProgram('symify.pp'); P.Targets.AddExampleProgram('symify.pp');