From a8ee66823a94b9378e6bac8e197ec3c6a95bba89 Mon Sep 17 00:00:00 2001
From: Michael VAN CANNEYT <mvancanneyt@tixeo.com>
Date: Mon, 6 Mar 2023 18:44:45 +0100
Subject: [PATCH] * Allow System.Variants (Delphi-compatible name) to be found
 when inserting variants unit

---
 compiler/pmodules.pas | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/compiler/pmodules.pas b/compiler/pmodules.pas
index 22a801198c..530bd7144d 100644
--- a/compiler/pmodules.pas
+++ b/compiler/pmodules.pas
@@ -211,23 +211,30 @@ implementation
     procedure maybeloadvariantsunit;
       var
         hp : tmodule;
+        addsystemnamespace : Boolean;
       begin
         { Do we need the variants unit? Skip this
           for VarUtils unit for bootstrapping }
         if not(mf_uses_variants in current_module.moduleflags) or
-           (current_module.modulename^='VARUTILS') then
+           (current_module.modulename^='VARUTILS') or
+           (current_module.modulename^='SYSTEM.VARUTILS') then
           exit;
         { Variants unit already loaded? }
         hp:=tmodule(loaded_units.first);
         while assigned(hp) do
           begin
-            if hp.modulename^='VARIANTS' then
+            if (hp.modulename^='VARIANTS') or (hp.modulename^='SYSTEM.VARIANTS') then
               exit;
             hp:=tmodule(hp.next);
           end;
         { Variants unit is not loaded yet, load it now }
         Message(parser_w_implicit_uses_of_variants_unit);
+        addsystemnamespace:=namespacelist.Find('System')=Nil;
+        if addsystemnamespace then
+          namespacelist.concat('System');
         AddUnit('variants');
+        if addsystemnamespace then
+          namespacelist.Remove('System');
       end;