From 5c5a6c3668c2112ce419f6b559105e915d9bd29d Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 15 Dec 2016 11:39:06 +0000
Subject: bootstrap building with --disable-dynloading on standard linux
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 registry/Executable_regmerge.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'registry/Executable_regmerge.mk')

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,\
-- 
cgit