summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2013-03-26 11:02:06 -0400
committerPeter Foley <pefoley2@verizon.net>2013-03-26 11:39:38 -0400
commitea360ff3ad9dac359f707cee5f0ca6548a7cd5d5 (patch)
tree01ced535c2c8e5692a5b649ed5197538b7da818e /solenv
parent4dd7010c007c89497b0b684ee4dbf699c2be1ee4 (diff)
add frm to Library_merged
Change-Id: I72fff5fe1fd26e618ffe89111471d95cd4d30852
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 117c0dfb029a..2217014050d3 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -45,6 +45,7 @@ gb_MERGEDLIBS := \
filterconfig \
for \
forui \
+ $(call gb_Helper_optional,DBCONNECTIVITY,frm) \
fsstorage \
fwe \
fwi \