[Libreoffice-commits] core.git: external/openldap

[Maarten Hoes]

 external/openldap/ExternalProject_openldap.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 109df0652440c31df7a19275167f8f5640722a1b
Author: Maarten Hoes <hoes.maarten at gmail.com>
Date:   Sat Dec 20 21:35:07 2014 +0100

    Honor additional LDFLAGS when exporting them on the commandline.
    
    Change-Id: I794f8d9d23234af46f16a71021be069ca5383f03
    Reviewed-on: https://gerrit.libreoffice.org/13568
    Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/external/openldap/ExternalProject_openldap.mk b/external/openldap/ExternalProject_openldap.mk
index 7c320cb..67c2a79 100644
--- a/external/openldap/ExternalProject_openldap.mk
+++ b/external/openldap/ExternalProject_openldap.mk
@@ -46,7 +46,7 @@ $(call gb_ExternalProject_get_state_target,openldap,build) :
 				CPPFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include" \
 				CFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include" \
 			) \
-			$(if $(openldap_LDFLAGS),LDFLAGS="$(openldap_LDFLAGS)") \
+			$(if $(openldap_LDFLAGS),LDFLAGS="$(LDFLAGS) $(openldap_LDFLAGS)") \
 		&& MAKEFLAGS= && $(MAKE) \
 	)