external/openldap/ExternalProject_openldap.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 73419efbe2402a78354615a4b564674a02741eee
Author: osnola <alo...@loria.fr>
Date: Tue Oct 31 12:22:41 2017 +0100
openldap: pass opt. flags to configure
Change-Id: Iffd71c9d662a0461ea663979e0c4a5bd8760d56a
Reviewed-on: https://gerrit.libreoffice.org/44111
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/external/openldap/ExternalProject_openldap.mk
b/external/openldap/ExternalProject_openldap.mk
index 6e66c436de9a..0c7aaa6ae17d 100644
--- a/external/openldap/ExternalProject_openldap.mk
+++ b/external/openldap/ExternalProject_openldap.mk
@@ -41,10 +41,10 @@ $(call gb_ExternalProject_get_state_target,openldap,build) :
ac_cv_func_memcmp_working=yes \
) \
$(if $(SYSTEM_NSS), \
- CPPFLAGS="$(CPPFLAGS) $(NSS_CFLAGS)"
CFLAGS="$(CFLAGS) $(NSS_CFLAGS)" LDFLAGS="$(LDFLAGS) $(NSS_LIBS)" \
+ CPPFLAGS="$(CPPFLAGS) $(NSS_CFLAGS)"
CFLAGS="$(CFLAGS) $(NSS_CFLAGS) $(if
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))"
LDFLAGS="$(LDFLAGS) $(NSS_LIBS)" \
, \
CPPFLAGS="$(CPPFLAGS) -I$(call
gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call
gb_UnpackedTarball_get_dir,nss)/dist/out/include" \
- CFLAGS="$(CFLAGS) -I$(call
gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call
gb_UnpackedTarball_get_dir,nss)/dist/out/include" \
+ CFLAGS="$(CFLAGS) $(if
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) -I$(call
gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call
gb_UnpackedTarball_get_dir,nss)/dist/out/include" \
) \
$(if $(openldap_LDFLAGS),LDFLAGS="$(LDFLAGS)
$(openldap_LDFLAGS)") \
&& MAKEFLAGS= && $(MAKE) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
