From f940d3f5fda14b53ad6eb277e700160f4ac7674e Mon Sep 17 00:00:00 2001 From: "Alejandro R. Mosteo" Date: Tue, 27 Feb 2024 15:39:01 +0100 Subject: [PATCH] Fix config loading before Windows builtins --- src/alire/alire-config-edit-early_load.adb | 2 ++ src/alire/alire-config-edit-early_load.ads | 2 +- src/alire/os_windows/alire-config-builtins-windows.ads | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/alire/alire-config-edit-early_load.adb b/src/alire/alire-config-edit-early_load.adb index 039df26f0..e0df70e51 100644 --- a/src/alire/alire-config-edit-early_load.adb +++ b/src/alire/alire-config-edit-early_load.adb @@ -9,4 +9,6 @@ package body Alire.Config.Edit.Early_Load is Alire.Config.Edit.Load_Config; end Load_Config; +begin + Load_Config; end Alire.Config.Edit.Early_Load; diff --git a/src/alire/alire-config-edit-early_load.ads b/src/alire/alire-config-edit-early_load.ads index fbb8af507..73656602e 100644 --- a/src/alire/alire-config-edit-early_load.ads +++ b/src/alire/alire-config-edit-early_load.ads @@ -1,4 +1,4 @@ -package Alire.Config.Edit.Early_Load is +package Alire.Config.Edit.Early_Load with Elaborate_Body is procedure Load_Config; -- For internal use of Alire_Early_Elaboration, DO NOT CALL otherwise. diff --git a/src/alire/os_windows/alire-config-builtins-windows.ads b/src/alire/os_windows/alire-config-builtins-windows.ads index 1cde220ff..ef3d2b422 100644 --- a/src/alire/os_windows/alire-config-builtins-windows.ads +++ b/src/alire/os_windows/alire-config-builtins-windows.ads @@ -1,4 +1,6 @@ -with Alire.Config.Edit; +-- Ensure config is loaded for some defaults below +with Alire.Config.Edit.Early_Load; +pragma Unreferenced (Alire.Config.Edit.Early_Load); package Alire.Config.Builtins.Windows is