mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-19 12:39:32 +02:00
Strip ext from exe name passed to compiler option -o. This is to make change in lazconf.pp work with unpatched compilers
Patch/Contributed by ccrause git-svn-id: trunk@62756 -
This commit is contained in:
parent
9df6eea67a
commit
147cf21fef
@ -2594,6 +2594,14 @@ var
|
|||||||
tempsw+=c;
|
tempsw+=c;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
function FixExeExtForEmbeddedCompiler(exename: string): string;
|
||||||
|
begin
|
||||||
|
if SameStr(TargetOS, 'embedded') then
|
||||||
|
Result := ChangeFileExt(exename, '')
|
||||||
|
else
|
||||||
|
Result := exename;
|
||||||
|
end;
|
||||||
|
|
||||||
begin
|
begin
|
||||||
switches := '';
|
switches := '';
|
||||||
|
|
||||||
@ -3214,7 +3222,8 @@ begin
|
|||||||
if not (ccloAbsolutePaths in Flags) then
|
if not (ccloAbsolutePaths in Flags) then
|
||||||
CurTargetFilename := CreateRelativePath(CurTargetFilename, BaseDirectory);
|
CurTargetFilename := CreateRelativePath(CurTargetFilename, BaseDirectory);
|
||||||
if CurTargetFilename<>'' then
|
if CurTargetFilename<>'' then
|
||||||
switches := switches + ' '+PrepareCmdLineOption('-o' + CurTargetFilename);
|
switches := switches + ' '+PrepareCmdLineOption('-o' +
|
||||||
|
FixExeExtForEmbeddedCompiler(CurTargetFilename));
|
||||||
end;
|
end;
|
||||||
|
|
||||||
// append custom options as last, so they can override
|
// append custom options as last, so they can override
|
||||||
|
Loading…
Reference in New Issue
Block a user