diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-10-01 00:06:38 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-10-01 10:39:56 +0200 |
commit | cb177b6d798ce244ac35923f34fb93e8c8839ee3 (patch) | |
tree | 3b6c22fc026064531c14a746b2d2c247c784aa7b /Repository.mk | |
parent | lcl_checkFrameBtlr: use SwTxtNode::GetTxtAttrAt (diff) | |
download | core-cb177b6d798ce244ac35923f34fb93e8c8839ee3.tar.gz core-cb177b6d798ce244ac35923f34fb93e8c8839ee3.zip |
libxmlsec: stop delivering static and import libraries
... and also check COM instead of CROSS_COMPILING.
Change-Id: I049c9211d4b6eabe4012f66d39d86c7b025dc18c
Diffstat (limited to 'Repository.mk')
-rw-r--r-- | Repository.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Repository.mk b/Repository.mk index aaca80a53f56..7e393d454d0b 100644 --- a/Repository.mk +++ b/Repository.mk @@ -652,12 +652,15 @@ $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ xmlsec1 \ - xmlsec1-nss \ )) -ifneq ($(CROSS_COMPILING),YES) +ifeq ($(COM),MSC) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ xmlsec1-mscrypto \ )) +else +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + xmlsec1-nss \ +)) endif endif |