diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-15 11:39:06 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-20 09:31:43 +0000 |
| commit | 5c5a6c3668c2112ce419f6b559105e915d9bd29d (patch) | |
| tree | cc62c238140a2a95ddda48abac74cbd8ee0b8b7b /unoidl | |
| parent | 0e0508b18f9daad618e19249daf008d518d5e860 (diff) | |
bootstrap building with --disable-dynloading on standard linux
Change-Id: I5baf70f0053612cba8b74f54aff11ce25cdeb95a
Reviewed-on: https://gerrit.libreoffice.org/32202
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'unoidl')
| -rw-r--r-- | unoidl/Executable_unoidl-check.mk | 6 | ||||
| -rw-r--r-- | unoidl/Executable_unoidl-read.mk | 6 | ||||
| -rw-r--r-- | unoidl/Executable_unoidl-write.mk | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/unoidl/Executable_unoidl-check.mk b/unoidl/Executable_unoidl-check.mk index 562fba9b8828..36dfc44de635 100644 --- a/unoidl/Executable_unoidl-check.mk +++ b/unoidl/Executable_unoidl-check.mk @@ -14,9 +14,11 @@ $(eval $(call gb_Executable_add_exception_objects,unoidl-check, \ )) $(eval $(call gb_Executable_use_libraries,unoidl-check, \ - sal \ - salhelper \ unoidl \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),reg) \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),store) \ + salhelper \ + sal \ )) # vim: set noet sw=4 ts=4: diff --git a/unoidl/Executable_unoidl-read.mk b/unoidl/Executable_unoidl-read.mk index af9c5fd36dbb..b134c30b1a72 100644 --- a/unoidl/Executable_unoidl-read.mk +++ b/unoidl/Executable_unoidl-read.mk @@ -14,9 +14,11 @@ $(eval $(call gb_Executable_add_exception_objects,unoidl-read, \ )) $(eval $(call gb_Executable_use_libraries,unoidl-read, \ - sal \ - salhelper \ unoidl \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),reg) \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),store) \ + salhelper \ + sal \ )) # vim: set noet sw=4 ts=4: diff --git a/unoidl/Executable_unoidl-write.mk b/unoidl/Executable_unoidl-write.mk index 8936955afb27..9accb31ac14d 100644 --- a/unoidl/Executable_unoidl-write.mk +++ b/unoidl/Executable_unoidl-write.mk @@ -14,9 +14,11 @@ $(eval $(call gb_Executable_add_exception_objects,unoidl-write, \ )) $(eval $(call gb_Executable_use_libraries,unoidl-write, \ - sal \ - salhelper \ unoidl \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),reg) \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),store) \ + salhelper \ + sal \ )) # vim: set noet sw=4 ts=4: |