diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-06-02 01:35:41 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-06-09 17:05:51 +0200 |
| commit | 548da05c53f007624d31e6ba46b4769dae9c4035 (patch) | |
| tree | 3d5d4f41ba54684d1d1d17a0b34d557cf1378de5 | |
| parent | 0a9f1cf88a9e891c3e33e371b57e29364fd4f00b (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
| -rw-r--r-- | RepositoryExternal.mk | 2 | ||||
| -rw-r--r-- | external/curl/ExternalPackage_curl.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 443ea6f52f8e..fc8c8f70a881 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2449,7 +2449,7 @@ $(call gb_LinkTarget_set_include,$(1),\ ifeq ($(COM),MSC) $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,curl)/lib/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),d)_imp.lib \ + $(call gb_UnpackedTarball_get_dir,curl)/lib/$(if $(MSVC_USE_DEBUG_RUNTIME),debug-dll,release-dll)/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),d)_imp.lib \ ) else $(call gb_LinkTarget_add_libs,$(1),\ 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) |