diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-10-25 14:26:22 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-25 17:37:35 +0200 |
| commit | 6fb13dd1aaf27ba7494cf65a11404339ef0e7754 (patch) | |
| tree | 618ddd656bf4f6eb9ed1bf4f863d3bdcf86902cc /curl | |
| parent | abc873feb3c805fd1f7c0a4b9b4a236617ec9ff7 (diff) | |
curl: disable use of debug configuration (needs msvcr90d.dll)
Change-Id: I7c22869028a78f48836741a4eb4cd5bbff16e884
Diffstat (limited to 'curl')
| -rw-r--r-- | curl/makefile.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/curl/makefile.mk b/curl/makefile.mk index d3da8b318b7c..7a8d784f2332 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -153,11 +153,14 @@ MACHINE=X86 MACHINE=X64 .ENDIF -.IF "$(debug)"=="" +# that debug configuration is disabled for now because it needs msvcr90d.dll +# (the debug MSVC runtime) and that is not copied into the solver currently, +# causing unit tests to fail +#.IF "$(debug)"=="" BUILD_ACTION=nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(MACHINE) -.ELSE -BUILD_ACTION=nmake -f Makefile.vc9 cfg=debug-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(MACHINE) -.ENDIF +#.ELSE +#BUILD_ACTION=nmake -f Makefile.vc9 cfg=debug-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(MACHINE) +#.ENDIF OUT2BIN=$(BUILD_DIR)$/libcurl.dll OUT2LIB=$(BUILD_DIR)$/libcurl.lib |