From ea61ed8efe8d84b88754b1c6af0a85a76b3ce424 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Fri, 20 Dec 2013 11:20:45 +0200
Subject: Avoid unnecessary library re-building in the DISABLE_DYNLOADING case

In the DISABLE_DYNLOADING case, a gbuild "Library" is actually a
static archive, so no point in having it depend on other libraries and
be re-created each time one of those have changed.

This hopefully will speed up incremental rebuilds for iOS and Android
nicely, especially in a debugging tree, as the creation of large
static archives with debug information is quite slow.

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

(limited to 'solenv')

diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 61b5b0fdbb4a..6ec827835a79 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -210,8 +210,6 @@ $(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 \
@@ -231,4 +229,23 @@ $(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:
-- 
cgit