diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-12-21 11:19:07 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-12-21 11:27:20 +0200 |
| commit | eb7347705b6081e10f4fbfda3366aa9aad595e4a (patch) | |
| tree | f04117324b8c4830cbbda6d4d2ccfe432daee032 /solenv/gbuild/Library.mk | |
| parent | c80bbdf1c1f3f6613881a2a62fce8f6d5ed53b8d (diff) | |
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
Diffstat (limited to 'solenv/gbuild/Library.mk')
| -rw-r--r-- | solenv/gbuild/Library.mk | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 6ec827835a79..61b5b0fdbb4a 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: |