diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-09-06 23:24:08 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-09-07 07:22:52 +0200 |
| commit | a5139f902f36500f7a2a0a8da3eef79c26416dab (patch) | |
| tree | a2112e59a85585d4b5d38bbfe83658521ece6db4 /external/curl | |
| parent | 4aabc5164d2a0d84e22fb3f6f66e020a8df6899a (diff) | |
Clean up passing CPPFLAGS/LDFLAGS into external/curl
Change-Id: I3a4730c9a43f5e4904504bb136b3ccbcf29207b4
Reviewed-on: https://gerrit.libreoffice.org/42030
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/curl')
| -rw-r--r-- | external/curl/ExternalProject_curl.mk | 6 |
1 files changed, 3 insertions, 3 deletions
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) \ ) |