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

* The hack calling ResolveFileNames directly does not work anymore

Browse Source 
git-svn-id: trunk@20761 -
This commit is contained in:
joost 2012-04-08 19:25:56 +00:00
parent dea196cddb
commit f8ab6e8adb
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/gdbint/fpmake.pp
View File

@ -56,6 +56,8 @@ begin
end; end;
end; end;
GdbVerTarget:=TTarget(p.Targets.ItemByName('gdbver'));
// When we're cross-compiling, running the gdbver executable to detect the // When we're cross-compiling, running the gdbver executable to detect the
// gdb-version is not possible, unless a i386-win32 to i386-go32v2 compilation // gdb-version is not possible, unless a i386-win32 to i386-go32v2 compilation
// is performed. // is performed.
@ -64,12 +66,9 @@ begin
or ((Defaults.CPU=i386) and (Defaults.OS=go32v2) and (HostOS=win32) and (HostCPU=i386))) then or ((Defaults.CPU=i386) and (Defaults.OS=go32v2) and (HostOS=win32) and (HostCPU=i386))) then
begin begin
P.Options.Add('-Fl'+GdbLibDir); P.Options.Add('-Fl'+GdbLibDir);
GdbVerTarget:=p.Targets.AddProgram('src'+PathDelim+'gdbver.pp');
Installer.BuildEngine.ResolveFileNames(p,HostCPU,HostOS,false);
Installer.BuildEngine.CreateOutputDir(p); Installer.BuildEngine.CreateOutputDir(p);
Installer.BuildEngine.Log(vlCommand,'GDB-lib found, compiling and running gdbver to obtain GDB-version'); Installer.BuildEngine.Log(vlCommand,'GDB-lib found, compiling and running gdbver to obtain GDB-version');
Installer.BuildEngine.Compile(P,GdbVerTarget); Installer.BuildEngine.Compile(P,GdbVerTarget);
p.Targets.Delete(GdbVerTarget.Index);
Installer.BuildEngine.ExecuteCommand(Installer.BuildEngine.AddPathPrefix(p,p. Installer.BuildEngine.ExecuteCommand(Installer.BuildEngine.AddPathPrefix(p,p.
GetBinOutputDir(Defaults.CPU, Defaults.OS))+PathDelim+ GetBinOutputDir(Defaults.CPU, Defaults.OS))+PathDelim+
AddProgramExtension('gdbver',HostOS),'-o ' + AddProgramExtension('gdbver',HostOS),'-o ' +
@ -95,7 +94,10 @@ begin
end end
else else
begin begin
// No suitable gdb found, use gdb_nogdb.inc // No suitable gdb found
// No need to compile gdbver.
p.Targets.Delete(GdbVerTarget.Index);
// use gdb_nogdb.inc
L := TStringList.Create; L := TStringList.Create;
try try
if P.Directory<>'' then if P.Directory<>'' then
@ -155,6 +157,7 @@ begin
P.BeforeCompileProc:=@BeforeCompile_gdbint; P.BeforeCompileProc:=@BeforeCompile_gdbint;
P.AfterCompileProc:=@AfterCompile_gdbint; P.AfterCompileProc:=@AfterCompile_gdbint;
p.Targets.AddProgram('src'+PathDelim+'gdbver.pp');
// //
// NOTE: the gdbver.inc dependancies gives warnings because the makefile.fpc // NOTE: the gdbver.inc dependancies gives warnings because the makefile.fpc
// does a "cp src/gdbver_nogdb.inc src/gdbver.inc" to create it // does a "cp src/gdbver_nogdb.inc src/gdbver.inc" to create it