diff options
| author | Mike Kaganski <mikekaganski@collabora.com> | 2018-05-24 06:45:27 -0700 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-05-25 00:25:26 -0700 |
| commit | 5596c16a34a2c8ac3b68ed7d7de2188640b17791 (patch) | |
| tree | 66739585e6330090b940d564945d39e7ab1fa0bb /external | |
| parent | 5eb96b416c26d77873363411f5d89a61c0f77f3d (diff) | |
Fix curl build on MSVC2013
Change-Id: Ie2e85d5c9945d4204f69135bc59e1d668294a83f
Reviewed-on: https://gerrit.libreoffice.org/54770
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit cce2149365fbf8599de18b277451aca0d0ce5f73)
Diffstat (limited to 'external')
| -rw-r--r-- | external/curl/ExternalProject_curl.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index 9c88acbd16d3..ff5b9adee1b2 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -69,11 +69,10 @@ $(call gb_ExternalProject_get_state_target,curl,build): else ifeq ($(COM),MSC) -$(eval $(call gb_ExternalProject_use_nmake,curl,build)) - $(call gb_ExternalProject_get_state_target,curl,build): $(call gb_ExternalProject_run,build,\ - nmake -f Makefile.vc \ + CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC))" \
+ MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc \ mode=dll \ VC=12 \ $(if $(filter X86_64,$(CPUNAME)),MACHINE=x64,MACHINE=x86) \ |