From b0bcca04dd69aea6adf677b3a03ed2eb1e25be00 Mon Sep 17 00:00:00 2001
From: Maxime Perrotin <Maxime.Perrotin@esa.int>
Date: Fri, 8 Sep 2017 14:41:01 +0200
Subject: [PATCH] Merge latest changes from master

---
 ada/buildsupport.adb | 12 +++++++++---
 buildsupport.gpr     |  6 ++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ada/buildsupport.adb b/ada/buildsupport.adb
index 9580950..bb415d8 100644
--- a/ada/buildsupport.adb
+++ b/ada/buildsupport.adb
@@ -1053,13 +1053,12 @@ procedure BuildSupport is
 
                   Find_Connected_Bus (Tmp_CI, Accessed_Bus, Accessed_Port);
                   if Accessed_Bus /= No_Node and then
-                     Accessed_Port /= No_Node
+                     Accessed_Port /= No_Node and then
+                     Associated_Processor_Name /= No_Name
                   then
                      Accessed_Bus_Name := Name (Identifier (Accessed_Bus));
                      Accessed_Port_Name := Name (Identifier (Accessed_Port));
-                  end if;
 
-                  if Associated_Processor_Name /= No_Name then
                      C_New_Device
                         (Get_Name_String (Name (Identifier (Processes))),
                          Get_Name_String
@@ -1081,6 +1080,13 @@ procedure BuildSupport is
                          Get_Name_String (Device_ASN1_Module),
                          Device_ASN1_Module_Len);
                      C_End_Device;
+                  else
+                     Exit_On_Error (True,
+                     "[ERROR] In your deployment view, check the connection of"
+                     & " this driver: "
+                     & Get_Name_String (Name (Identifier (Processes)))
+                     & " - in processor "
+                     & Get_Name_String (Associated_Processor_Name));
                   end if;
                end;
             end if;
diff --git a/buildsupport.gpr b/buildsupport.gpr
index 31860c2..1005a6d 100644
--- a/buildsupport.gpr
+++ b/buildsupport.gpr
@@ -27,7 +27,8 @@ project BuildSupport is
          "-gnatwa",
          "-gnatoa",
          "-gnatg",
-         "-fstack-check");
+         "-fstack-check",
+         "-no-pie");
 
       for Default_Switches ("C") use
          ("-g",
@@ -53,7 +54,8 @@ project BuildSupport is
           "-Wno-error=old-style-cast",
           "-Wundef",
           "-std=c11",
-          "-pedantic");
+          "-pedantic",
+          "-no-pie");
    end Compiler;
 
 end BuildSupport;
-- 
GitLab