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 /registry | |
| 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 'registry')
| -rw-r--r-- | registry/Executable_regmerge.mk | 4 | ||||
| -rw-r--r-- | registry/Executable_regview.mk | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/registry/Executable_regmerge.mk b/registry/Executable_regmerge.mk index 94a8e974ff79..98176282b60e 100644 --- a/registry/Executable_regmerge.mk +++ b/registry/Executable_regmerge.mk @@ -10,8 +10,10 @@ $(eval $(call gb_Executable_Executable,regmerge)) $(eval $(call gb_Executable_use_libraries,regmerge,\ - sal \ reg \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),store) \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),salhelper) \ + sal \ )) $(eval $(call gb_Executable_use_static_libraries,regmerge,\ diff --git a/registry/Executable_regview.mk b/registry/Executable_regview.mk index 62b46acfc975..ef9fda099b06 100644 --- a/registry/Executable_regview.mk +++ b/registry/Executable_regview.mk @@ -15,8 +15,10 @@ $(eval $(call gb_Executable_set_include,regview, \ )) $(eval $(call gb_Executable_use_libraries,regview,\ - sal \ reg \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),store) \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),salhelper) \ + sal \ )) $(eval $(call gb_Executable_use_static_libraries,regview,\ |