Update Brave RMAP lib linking.

orchestrator/taste-orchestrator.py

@@ -1177,20 +1177,19 @@ def InvokeOcarinaMakefiles(
                 if extraLibs != []:
                     externals += ' '.join(extraLibs) + ' '
 
+            for aplc in g_distributionNodes[node]:
+                if aplc in cSubsystems.keys() and os.getenv("BRAVE") is not None: # TODO be more specific and check if block defines any fpga configurations, otherwise library is not needed
+                    externals += ' "' + getSingleLineFromCmdOutput("echo $DMT").strip() + '/Brave/libBrave.a" '
+                    break
+
             for aplc in g_distributionNodes[node]:
                 if aplc in vhdlSubsystems.keys():
                     if g_bPolyORB_HI_C:
-                        if os.getenv("BRAVE") is not None:
-                            externals += ' "' + getSingleLineFromCmdOutput("echo $DMT").strip() + '/Brave/libBrave.a" '
-                        else:
-                            # externals += ' "' + getSingleLineFromCmdOutput("echo $DMT").strip() + '/OG/libESAFPGAforC.a" '
-                            externals += ' "' + getSingleLineFromCmdOutput("echo $DMT").strip() + '/ZestSC1/libZestSC1.a" /lib/i386-linux-gnu/libusb-0.1.so.4 '
+                        # externals += ' "' + getSingleLineFromCmdOutput("echo $DMT").strip() + '/OG/libESAFPGAforC.a" '
+                        externals += ' "' + getSingleLineFromCmdOutput("echo $DMT").strip() + '/ZestSC1/libZestSC1.a" /lib/i386-linux-gnu/libusb-0.1.so.4 '
                     else:
-                        if os.getenv("BRAVE") is not None:
-                            externals += ' "' + getSingleLineFromCmdOutput("echo $DMT").strip() + '/Brave/libBrave.a"'
-                        else:
-                            # externals += ' "' + getSingleLineFromCmdOutput("echo $DMT").strip() + '/OG/libESAFPGA.a" '
-                            externals += ' "' + getSingleLineFromCmdOutput("echo $DMT").strip() + '/ZestSC1/libZestSC1.a" /lib/i386-linux-gnu/libusb-0.1.so.4'
+                        # externals += ' "' + getSingleLineFromCmdOutput("echo $DMT").strip() + '/OG/libESAFPGA.a" '
+                        externals += ' "' + getSingleLineFromCmdOutput("echo $DMT").strip() + '/ZestSC1/libZestSC1.a" /lib/i386-linux-gnu/libusb-0.1.so.4'
                     break  # If you meet even one VHDL component for this node, the library was added to externals, no need to check further
 
             userCFlags += mflags(node)