solenv/gbuild/ExternalProject.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2ec4aa9f24d618bae5be84b804bf4a51faea4e32
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue May 3 08:55:41 2022 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue May 3 13:36:09 2022 +0200
Keep passing LDFLAGS into external proejct builds
...which had been broken with 1ffd6897ddf15624e70585ab08e8af713114c938 "try
to
use also proper debug LDFLAGS for externals libraries", and e.g. one of my
macOS
builds uses a non-standard Clang compiler and libc++ library, and thus needs
LDFLAGS=-L/Users/stephan/llvm/inst/lib
in autogen.input
Change-Id: Iae67a4a13603b0241e5cd6c0d01a07ac898ffb58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133746
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index 68910712ff6d..5227e6c13bec 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -212,7 +212,7 @@ gb_ExternalProject_get_build_flags = $(call
gb_LinkTarget__get_debugflags,Extern
# Returns flags to include in LDFLAGS to enable optimizations and/or debugging.
# gb_ExternalProject_get_link_flags project
-gb_ExternalProject_get_link_flags = $(USE_LD) $(call
gb_LinkTarget__get_debugldflags,ExternalProject_$(1))
+gb_ExternalProject_get_link_flags = $(LDFLAGS) $(USE_LD) $(call
gb_LinkTarget__get_debugldflags,ExternalProject_$(1))
# Run a target command
#
