diff options
Diffstat (limited to 'gcc/ada/prj-conf.adb')
| -rw-r--r-- | gcc/ada/prj-conf.adb | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gcc/ada/prj-conf.adb b/gcc/ada/prj-conf.adb index f16509b..225e0e8 100644 --- a/gcc/ada/prj-conf.adb +++ b/gcc/ada/prj-conf.adb @@ -1425,12 +1425,7 @@ package body Prj.Conf is Write_Line (Config_File_Path.all); end if; - if On_Load_Config /= null then - On_Load_Config - (Config_File => Config_Project_Node, - Project_Node_Tree => Project_Node_Tree); - - elsif Config_File_Path /= null then + if Config_File_Path /= null then Prj.Part.Parse (In_Tree => Project_Node_Tree, Project => Config_Project_Node, @@ -1444,6 +1439,12 @@ package body Prj.Conf is Config_Project_Node := Empty_Node; end if; + if On_Load_Config /= null then + On_Load_Config + (Config_File => Config_Project_Node, + Project_Node_Tree => Project_Node_Tree); + end if; + if Config_Project_Node /= Empty_Node then Prj.Proc.Process_Project_Tree_Phase_1 (In_Tree => Project_Tree, |