Merge remote-tracking branch 'ocarina-GitHub/master'

README.rst

@@ -34,11 +34,13 @@ Refer to the  `ocarina-build <https://github.com/openaadl/ocarina-build>`_ compa
 Q&A:
 ----
 
-Build status for Linux and OS X: |build-status|
-
-Code coverage: |coverage|
-
-CII Best practice: |cii|
++----------------------------------+---------------+
+| Build status for Linux and OS X  ||build-status| |
++----------------------------------+---------------+
+| Code coverage                    | |coverage|    |
++----------------------------------+---------------+
+| CII Best practice                | |cii|         |
++----------------------------------+---------------+
 
 .. |build-status| image:: https://travis-ci.org/OpenAADL/ocarina.svg?branch=master 
   :target: https://travis-ci.org/OpenAADL/ocarina

src/backends/po_hi_ada/ocarina-backends-po_hi_ada.adb

@@ -221,12 +221,16 @@ package body Ocarina.Backends.PO_HI_Ada is
          Free (Target_Prefix);
          Free (Target);
 
-         Write_Str ("USER_CFLAGS =");
-         Write_Name (USER_CFLAGS);
-         Write_Eol;
-         Write_Str ("USER_LDFLAGS =");
-         Write_Name (USER_LDFLAGS);
-         Write_Eol;
+         if USER_CFLAGS /= No_Name then
+            Write_Str ("USER_CFLAGS += $(USER_CFLAGS)");
+            Write_Name (USER_CFLAGS);
+            Write_Eol;
+         end if;
+         if USER_LDFLAGS /= No_Name then
+            Write_Str ("USER_LDFLAGS += $(USER_LDFLAGS)");
+            Write_Name (USER_LDFLAGS);
+            Write_Eol;
+         end if;
 
          --  Project file