diff options
| author | Maarten Hoes <hoes.maarten@gmail.com> | 2014-12-20 21:35:07 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-12-21 15:07:01 +0000 |
| commit | 109df0652440c31df7a19275167f8f5640722a1b (patch) | |
| tree | 0d131678076dacbf16354212b6f4b28cbd4acba7 /external/openldap | |
| parent | fdo#39440 sc: reduce scope of local variables (diff) | |
| download | core-109df0652440c31df7a19275167f8f5640722a1b.tar.gz core-109df0652440c31df7a19275167f8f5640722a1b.zip | |
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@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'external/openldap')
| -rw-r--r-- | external/openldap/ExternalProject_openldap.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/openldap/ExternalProject_openldap.mk b/external/openldap/ExternalProject_openldap.mk index 7c320cb01129..67c2a795b6b6 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) \ ) |