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

Disable finalisation code fro LLVM compiler to avoid interface finalisation troubles

Browse Source
This commit is contained in:
Pierre Muller 2022-06-01 00:19:24 +02:00
parent a27bc236a0
commit 0e142c00cc
4 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compiler/ngenutil.pas
View File

@ -787,6 +787,7 @@ implementation
(vo_is_funcret in tabstractnormalvarsym(p).varoptions) (vo_is_funcret in tabstractnormalvarsym(p).varoptions)
) )
) and ) and
not (vo_is_parentfp in tabstractnormalvarsym(p).varoptions) and
not assigned(tabstractnormalvarsym(p).defaultconstsym); not assigned(tabstractnormalvarsym(p).defaultconstsym);
end; end;

BIN
packages/fpmake-llvm Executable file
View File

Binary file not shown.

BIN
packages/fpmake-reg Executable file
View File

Binary file not shown.

5
packages/fpmkunit/src/fpmkunit.pp
View File

@ -28,6 +28,9 @@ unit fpmkunit;
Interface Interface
{$ifdef CPULLVM}
{$define LLVM_INTERFACE_PROBLEM}
{$endif CPULLVM}
{$IFDEF MORPHOS} {$IFDEF MORPHOS}
{$DEFINE NO_UNIT_PROCESS} {$DEFINE NO_UNIT_PROCESS}
{$DEFINE NO_THREADING} {$DEFINE NO_THREADING}
@ -10131,12 +10134,14 @@ Initialization
GetPluginManager.RegisterPlugin(TfpmResolvePackagePathsPlugin); GetPluginManager.RegisterPlugin(TfpmResolvePackagePathsPlugin);
Finalization Finalization
{$ifndef LLVM_INTERFACE_PROBLEM}
FreeAndNil(CustomFpMakeCommandlineValues); FreeAndNil(CustomFpMakeCommandlineValues);
FreeAndNil(CustomFpmakeCommandlineOptions); FreeAndNil(CustomFpmakeCommandlineOptions);
FreeAndNil(DefInstaller); FreeAndNil(DefInstaller);
FreeAndNil(GlobalDictionary); FreeAndNil(GlobalDictionary);
FreeAndNil(Defaults); FreeAndNil(Defaults);
FreeAndNil(GPluginManager); FreeAndNil(GPluginManager);
{$endif ndef LLVM_INTERFACE_PROBLEM}
end. end.