From 9c069f83c3ae57eba81e2dcd25c1f1d6b6c98a36 Mon Sep 17 00:00:00 2001 From: yoogx Date: Fri, 29 May 2020 12:18:00 -0400 Subject: [PATCH] * Extend VPATH in the case of source code defined in other directories. For openaadl/ocarina#255 --- src/backends/ocarina-backends-build_utils.adb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/backends/ocarina-backends-build_utils.adb b/src/backends/ocarina-backends-build_utils.adb index b919d46e..3bd13af0 100644 --- a/src/backends/ocarina-backends-build_utils.adb +++ b/src/backends/ocarina-backends-build_utils.adb @@ -2005,8 +2005,6 @@ package body Ocarina.Backends.Build_Utils is --------------------- procedure Compile_C_Files (C_Sources : Name_Tables.Instance) is - pragma Unreferenced (C_Sources); - begin -- Define VPATH, search path for All Prerequisites @@ -2014,8 +2012,15 @@ package body Ocarina.Backends.Build_Utils is if Scenario_Dir /= null then Write_Str (":" & Scenario_Dir.all); end if; - Write_Eol; - Write_Eol; + + if Length (C_Sources) > 0 then + for J in Name_Tables.First .. Name_Tables.Last (C_Sources) loop + Write_Str (":"); + Write_Str + (Dir_Name (Get_Name_String (C_Sources.Table (J)))); + exit when J = Name_Tables.Last (C_Sources); + end loop; + end if; -- Generic rule for compiling C files -- GitLab