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

[Stephan Bergmann]

 external/curl/ExternalProject_curl.mk |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a5139f902f36500f7a2a0a8da3eef79c26416dab
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 6 23:24:08 2017 +0200

    Clean up passing CPPFLAGS/LDFLAGS into external/curl
    
    Change-Id: I3a4730c9a43f5e4904504bb136b3ccbcf29207b4
    Reviewed-on: https://gerrit.libreoffice.org/42030
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk
index 95d004e097d1..d6590c368193 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_ExternalProject_register_targets,curl,\
 ifneq ($(OS),WNT)
 
 curl_CPPFLAGS :=
-curl_LDFLAGS := $(if $(filter LINUX FREEBSD,$(OS)),"-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN)
+curl_LDFLAGS := $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN)
 
 ifneq ($(OS),ANDROID)
 ifneq ($(SYSBASE),)
@@ -39,8 +39,6 @@ endif
 # use --with-nss only on platforms other than Mac OS X and iOS
 $(call gb_ExternalProject_get_state_target,curl,build):
 	$(call gb_ExternalProject_run,build,\
-		CPPFLAGS="$(curl_CPPFLAGS)" \
-		LDFLAGS=$(curl_LDFLAGS) \
 		./configure \
 			$(if $(filter IOS MACOSX,$(OS)),\
 				--with-darwinssl,\
@@ -60,6 +58,8 @@ $(call gb_ExternalProject_get_state_target,curl,build):
 			$(if $(ENABLE_DEBUG),--enable-debug) \
 			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
+			CPPFLAGS='$(curl_CPPFLAGS)' \
+			LDFLAGS='$(curl_LDFLAGS)' \
 		&& cd lib \
 		&& $(MAKE) \
 	)