summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-06-02 01:35:41 +0200
committerMichael Stahl <mstahl@redhat.com>2014-06-09 17:05:51 +0200
commit548da05c53f007624d31e6ba46b4769dae9c4035 (patch)
tree3d5d4f41ba54684d1d1d17a0b34d557cf1378de5 /external
parent0a9f1cf88a9e891c3e33e371b57e29364fd4f00b (diff)
curl: work around mysterious xcopy failure
When building with Win32 make, the xcopy at the end of the build fails with "Invalid arguments" error, which is clearly wrong, since the arguments are exactly the same as before, and furthermore curl is not built with GNU make at all, but with nmake! W-T-F? Change-Id: Idc0b362202e1d14722573662bebeda0bc7070660
Diffstat (limited to 'external')
-rw-r--r--external/curl/ExternalPackage_curl.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/external/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk
index 62669122a800..ed5589212dad 100644
--- a/external/curl/ExternalPackage_curl.mk
+++ b/external/curl/ExternalPackage_curl.mk
@@ -16,7 +16,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
ifeq ($(OS)$(COM),WNTGCC)
$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.dll,lib/.libs/libcurl.dll))
else ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll,lib/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll))
+$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll,lib/$(if $(MSVC_USE_DEBUG_RUNTIME),debug-dll,release-dll)/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll))
else ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.4.dylib,lib/.libs/libcurl.4.dylib))
else ifeq ($(OS),AIX)