paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-11 18:08:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

* don't load the controller unit if the currently compiled unit *is* the controller unit (which might happen if one compiles the controller unit as part of a program)

Browse Source
This commit is contained in:
Sven/Sarah Barth 2022-06-15 22:49:22 +02:00
parent d8196a6ffe
commit c3f27a2f1c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/pmodules.pas
View File

@ -410,7 +410,8 @@ implementation
{ CPU targets with microcontroller support can add a controller specific unit }
if ControllerSupport and (target_info.system in (systems_embedded+systems_freertos)) and
(current_settings.controllertype<>ct_none) and
(embedded_controllers[current_settings.controllertype].controllerunitstr<>'') then
(embedded_controllers[current_settings.controllertype].controllerunitstr<>'') and
(embedded_controllers[current_settings.controllertype].controllerunitstr<>current_module.modulename^) then
AddUnit(embedded_controllers[current_settings.controllertype].controllerunitstr);
{$pop}
{$ifdef XTENSA}