diff options
author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-07-16 17:07:07 +0200 |
---|---|---|
committer | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-07-16 17:07:07 +0200 |
commit | 9a9bf62c4cb7e1238bd383e1e4dd0582b26846f1 (patch) | |
tree | bd8e4fadb3d54afe558cd9aed69707ccc1cc5420 /Library_merged.mk | |
parent | libfbembed depends on firebird being enabled. (diff) | |
download | core-9a9bf62c4cb7e1238bd383e1e4dd0582b26846f1.tar.gz core-9a9bf62c4cb7e1238bd383e1e4dd0582b26846f1.zip |
Fix firebird with libmerged.
Change-Id: I2784700686981c3eb487daae00b9f537658771bd
Diffstat (limited to 'Library_merged.mk')
-rw-r--r-- | Library_merged.mk | 4 |
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 \ |