summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2022-05-03 08:55:41 +0200
committerStephan Bergmann <sbergman@redhat.com>2022-05-03 13:36:09 +0200
commit2ec4aa9f24d618bae5be84b804bf4a51faea4e32 (patch)
tree14945fa7884cc5657e33b919b8f1c003e0ad5ab8 /solenv
parent46972be699730f4dc381a19b5d50a02eae407a71 (diff)
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 <sbergman@redhat.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/ExternalProject.mk2
1 files changed, 1 insertions, 1 deletions
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
#