summaryrefslogtreecommitdiff
path: root/Library_merged.mk
diff options
context:
space:
mode:
authorAndrzej J.R. Hunt <andrzej@ahunt.org>2013-07-16 17:07:07 +0200
committerAndrzej J.R. Hunt <andrzej@ahunt.org>2013-07-16 17:07:07 +0200
commit9a9bf62c4cb7e1238bd383e1e4dd0582b26846f1 (patch)
treebd8e4fadb3d54afe558cd9aed69707ccc1cc5420 /Library_merged.mk
parent3f195b9b14a872d0bd1dc62a781a4ba8c197f697 (diff)
Fix firebird with libmerged.
Change-Id: I2784700686981c3eb487daae00b9f537658771bd
Diffstat (limited to 'Library_merged.mk')
-rw-r--r--Library_merged.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Library_merged.mk b/Library_merged.mk
index 439f437c6904..7f605ab11543 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -47,8 +47,8 @@ $(eval $(call gb_Library_use_externals,merged,\
icuuc \
jpeg \
lcms2 \
- libatomic_ops \
- libfbembed \
+ $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
+ $(call gb_Helper_optional,FIREBIRD,libfbembed) \
liblangtag \
libxml2 \
libxslt \