paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-29 20:30:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: fixed cross compiling target OS/CPU for IDE

Browse Source 
git-svn-id: trunk@12493 -
This commit is contained in:
mattias 2007-10-16 20:54:26 +00:00
parent ebef050781
commit 8d2a89ca23
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ide/buildlazdialog.pas
View File

@ -498,6 +498,8 @@ var
NewUnitDirectory: String; NewUnitDirectory: String;
DefaultTargetOS: string; DefaultTargetOS: string;
DefaultTargetCPU: string; DefaultTargetCPU: string;
NewTargetOS: String;
NewTargetCPU: String;
begin begin
Result:=mrOk; Result:=mrOk;
CurItem:=Options.Items[ItemIndex]; CurItem:=Options.Items[ItemIndex];
@ -561,15 +563,18 @@ begin
DefaultTargetOS:=GetDefaultTargetOS; DefaultTargetOS:=GetDefaultTargetOS;
DefaultTargetCPU:=GetDefaultTargetCPU; DefaultTargetCPU:=GetDefaultTargetCPU;
if ((Options.TargetOS<>'') NewTargetOS:=Options.TargetOS;
and (CompareText(Options.TargetOS,DefaultTargetOS)<>0)) NewTargetCPU:=Options.TargetCPU;
or ((Options.TargetCPU<>'') if NewTargetOS='' then NewTargetOS:=DefaultTargetOS;
and (CompareText(Options.TargetCPU,DefaultTargetCPU)<>0)) then if NewTargetCPU='' then NewTargetCPU:=DefaultTargetCPU;
DebugLn(['CreateBuildLazarusOptions NewTargetOS=',NewTargetOS,' NewTargetCPU=',NewTargetCPU]);
if(CompareText(NewTargetOS,DefaultTargetOS)<>0)
or (CompareText(NewTargetCPU,DefaultTargetCPU)<>0) then
begin begin
// Case 2. crosscompiling the IDE // Case 2. crosscompiling the IDE
// create directory <primary config dir>/bin/<TargetCPU>-<TargetOS> // create directory <primary config dir>/bin/<TargetCPU>-<TargetOS>
NewTargetDirectory:=AppendPathDelim(GetPrimaryConfigPath)+'bin' NewTargetDirectory:=AppendPathDelim(GetPrimaryConfigPath)+'bin'
+PathDelim+Options.TargetCPU+'-'+Options.TargetOS; +PathDelim+NewTargetOS+'-'+NewTargetCPU;
Macros.SubstituteStr(NewUnitDirectory); Macros.SubstituteStr(NewUnitDirectory);
debugln('CreateBuildLazarusOptions Options.TargetOS=',Options.TargetOS,' Options.TargetCPU=',Options.TargetCPU,' DefaultOS=',DefaultTargetOS,' DefaultCPU=',DefaultTargetCPU); debugln('CreateBuildLazarusOptions Options.TargetOS=',Options.TargetOS,' Options.TargetCPU=',Options.TargetCPU,' DefaultOS=',DefaultTargetOS,' DefaultCPU=',DefaultTargetCPU);
Result:=ForceDirectoryInteractive(NewTargetDirectory,[]); Result:=ForceDirectoryInteractive(NewTargetDirectory,[]);
@ -590,7 +595,7 @@ begin
// create directory <primary config dir>/bin/ // create directory <primary config dir>/bin/
NewTargetDirectory:=AppendPathDelim(GetPrimaryConfigPath)+'bin'; NewTargetDirectory:=AppendPathDelim(GetPrimaryConfigPath)+'bin';
NewUnitDirectory:=AppendPathDelim(GetPrimaryConfigPath)+'units' NewUnitDirectory:=AppendPathDelim(GetPrimaryConfigPath)+'units'
+PathDelim+Options.TargetCPU+'-'+Options.TargetOS; +PathDelim+NewTargetCPU+'-'+NewTargetOS;
debugln('CreateBuildLazarusOptions LazDir readonly NewTargetDirectory=',NewTargetDirectory); debugln('CreateBuildLazarusOptions LazDir readonly NewTargetDirectory=',NewTargetDirectory);
Result:=ForceDirectoryInteractive(NewTargetDirectory,[]); Result:=ForceDirectoryInteractive(NewTargetDirectory,[]);
if Result<>mrOk then exit; if Result<>mrOk then exit;
@ -599,7 +604,7 @@ begin
if OSLocksExecutables then begin if OSLocksExecutables then begin
// Case 4. the current executable is locked // Case 4. the current executable is locked
// => use a different output name // => use a different output name
NewTargetFilename:='lazarus.new'+GetExecutableExt(Options.TargetOS); NewTargetFilename:='lazarus.new'+GetExecutableExt(NewTargetOS);
debugln('CreateBuildLazarusOptions exe locked NewTargetFilename=',NewTargetFilename); debugln('CreateBuildLazarusOptions exe locked NewTargetFilename=',NewTargetFilename);
end else begin end else begin
// Case 5. or else: => just compile to current directory // Case 5. or else: => just compile to current directory
@ -629,7 +634,7 @@ begin
// For example under linux, where executables don't need any extension // For example under linux, where executables don't need any extension
// fpc removes the last extension of the -o option. // fpc removes the last extension of the -o option.
// Trick fpc: // Trick fpc:
if GetExecutableExt(Options.TargetOS)='' then if GetExecutableExt(NewTargetOS)='' then
NewTargetFilename:=NewTargetFilename+'.dummy'; NewTargetFilename:=NewTargetFilename+'.dummy';
AppendExtraOption('-o'+NewTargetFilename); AppendExtraOption('-o'+NewTargetFilename);
end; end;