[Libreoffice-commits] core.git: solenv/gbuild

[Tor Lillqvist]

 solenv/gbuild/Library.mk |   21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

New commits:
commit eb7347705b6081e10f4fbfda3366aa9aad595e4a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Dec 21 11:19:07 2013 +0200

    Revert "Avoid unnecessary library re-building in the DISABLE_DYNLOADING case"
    
    Unfortunately doing it like that breaks the case where as part of
    building a dependent library some headers are generated and those
    headers are then needed when compiling a depending library. Case in
    point: sqlbison.hxx.
    
    (Sure, for that particular case, as such it is fairly likely that we
    don't want any of the database connectivity code at all in any iOS or
    Android case, but working on the --disable-database-connectivity
    configure switch is another task...)
    
    This reverts commit ea61ed8efe8d84b88754b1c6af0a85a76b3ce424.
    
    Change-Id: I8dd1f260160c90473ecf12ce862f37df9767fa19

diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 6ec8278..61b5b0f 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -210,6 +210,8 @@ $(eval $(foreach method,\
 	use_internal_api \
 	use_internal_bootstrap_api \
 	use_internal_comprehensive_api \
+	use_libraries \
+	use_static_libraries \
 	use_external \
 	use_externals \
 	use_custom_headers \
@@ -229,23 +231,4 @@ $(eval $(foreach method,\
 	$(call gb_Library__forward_to_Linktarget,$(method))\
 ))
 
-ifeq ($(DISABLE_DYNLOADING),TRUE)
-
-define gb_Library_use_libraries
-endef
-
-define gb_Library_use_static_libraries
-endef
-
-else
-
-$(eval $(foreach method,\
-	use_libraries \
-	use_static_libraries \
-,\
-	$(call gb_Library__forward_to_Linktarget,$(method))\
-))
-
-endif
-
 # vim: set noet sw=4: