From 7d3c674a0444e7688178b00ae4675bb65c685798 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 20 Dec 2011 18:06:46 +0200 Subject: Abandon attempt to use the debug CRT in a dbgutil build --- RepositoryFixes.mk | 4 ---- cairo/pixman-0.24.0.patch | 2 +- configure.in | 9 --------- icu/createmak.pl | 12 ------------ python/Python-2.6.1.patch | 2 +- solenv/gbuild/gbuild.mk | 4 ++++ solenv/gbuild/gbuild_simple.mk | 2 -- solenv/gbuild/platform/WNT_INTEL_MSC.mk | 3 +-- solenv/inc/settings.mk | 1 - soltools/mkdepend/makefile.mk | 5 ----- 10 files changed, 7 insertions(+), 37 deletions(-) diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 901f7b8e1b9c..ff1eb34e67eb 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -125,10 +125,6 @@ gb_Library_NOILIBFILENAMES += \ gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES)) gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT)) -ifneq ($(gb_PRODUCT),$(true)) -gb_Library_FILENAMES := $(patsubst msvcrt:msvcrt%,msvcrt:msvcrtd%,$(gb_Library_FILENAMES)) -endif - endif # ifeq ($(COM),GCC) endif # ifeq ($(OS),WNT) diff --git a/cairo/pixman-0.24.0.patch b/cairo/pixman-0.24.0.patch index a6141ac4b154..39122cde00eb 100644 --- a/cairo/pixman-0.24.0.patch +++ b/cairo/pixman-0.24.0.patch @@ -19,7 +19,7 @@ +endif + +ifeq ($(CFG_VAR),debug) -+CFG_CFLAGS = -MDd -Od -Zi ++CFG_CFLAGS = -MD -Od -Zi +CFG_LDFLAGS = -DEBUG +else +CFG_CFLAGS = -MD -O2 diff --git a/configure.in b/configure.in index 120ed1ffb10a..c60a4ecbd404 100644 --- a/configure.in +++ b/configure.in @@ -2434,15 +2434,6 @@ if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then PROEXT="" PRODUCT="" - # Compiling with MSVC using --enable-dbgutil (i.e. using the - # debugging runtime, and defining _DEBUG when compiling) just - # causes too many compilation errors. After having spent some - # months slowly fixing them one by one, having reached sw, I give - # up. Feel free to try again. - if test "$_os" = WINNT -a "$WITH_MINGW" != yes; then - AC_MSG_ERROR([Sorry, --enable-dbgutil won't work with MSVC]) - fi - AC_MSG_RESULT([yes]) # cppunit and graphite expose STL in public headers if test "$with_system_cppunit" = "yes"; then diff --git a/icu/createmak.pl b/icu/createmak.pl index 891c5e33a778..3786ec1d1069 100644 --- a/icu/createmak.pl +++ b/icu/createmak.pl @@ -364,12 +364,6 @@ sub createMakDepSection #01.04.2008 13:36 { $line =~ s/CPP_PROJ=/CPPX_PROJ=/; $line =~ s/-Za/-Ze/; - if ( $nonpro ) - { - # if non product link against debug libraries - $line =~ s/-MD/-MDd/; - $line =~ s/-MT/-MTd/; - } push @{$ref_make_file}, $line; } } @@ -703,12 +697,6 @@ sub print_flags #18.04.2008 14:19 @template = @{$template_hash{$switch}}; foreach $line(@template) { - if ( $nonpro ) - { - # if non product link against debug libraries - $line =~ s/-MD/-MDd/; - $line =~ s/-MT/-MTd/; - } print MAKFILE $line; } } diff --git a/python/Python-2.6.1.patch b/python/Python-2.6.1.patch index ac70bab33f70..fe04ae33b384 100644 --- a/python/Python-2.6.1.patch +++ b/python/Python-2.6.1.patch @@ -434,7 +434,7 @@ } else if (strcmp(argv[1], "Debug") == 0) { - strcat_s(command, CMD_SIZE, "-D_DEBUG -MDd "); -+ strcat_s(command, CMD_SIZE, "-D_DEBUG -MD "); ++ strcat_s(command, CMD_SIZE, "-MD "); } else if (strcmp(argv[1], "ReleaseItanium") == 0) { strcat_s(command, CMD_SIZE, "-MD /USECL:MS_ITANIUM "); diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 521a9c929071..a75fda279bb7 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -194,9 +194,13 @@ gb_GLOBALDEFS += \ else gb_GLOBALDEFS += \ -DDBG_UTIL \ + +ifneq ($(COM),MSC) +gb_GLOBALDEFS += \ -D_DEBUG \ endif +endif ifneq ($(strip $(SOLAR_JAVA)),) gb_GLOBALDEFS += -DSOLAR_JAVA diff --git a/solenv/gbuild/gbuild_simple.mk b/solenv/gbuild/gbuild_simple.mk index aeac005e4bd4..a4cdb0d73847 100644 --- a/solenv/gbuild/gbuild_simple.mk +++ b/solenv/gbuild/gbuild_simple.mk @@ -46,8 +46,6 @@ include $(GBUILDDIR)/BuildDirs.mk # I think any use of gbuild_simple.mk is in a sub-make under one that # uses gbuild.mk anyway. -# gb_PRODUCT is used by windows.mk to decide which C/C++ runtime to -# link with. ifneq ($(strip $(PRODUCT)$(product)),) gb_PRODUCT := $(true) else diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 3809f3b41524..36c95f6c346f 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -359,12 +359,11 @@ $(call gb_Helper_abbreviate_dirs_native,\ $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ $(if $(filter YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS, -SUBSYSTEM:CONSOLE) \ $(T_LDFLAGS) \ - $(if $(gb_PRODUCT),,-NODEFAULTLIB) \ @$${RESPONSEFILE} \ $(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))) \ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_filename,$(lib))) \ $(LIBS) \ - $(if $(filter-out StaticLibrary,$(TARGETTYPE)),$(if $(gb_PRODUCT),,oldnames.lib $(if $(filter libcmtd,$(LINKED_LIBS)),,msvcrtd.lib) msvcprtd.lib kernel32.lib) user32.lib) \ + $(if $(filter-out StaticLibrary,$(TARGETTYPE)),user32.lib) \ $(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); RC=$$?; rm $${RESPONSEFILE} \ $(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) \ $(if $(filter Executable,$(TARGETTYPE)),; if [ -f $@.manifest ]; then mt.exe $(MTFLAGS) -manifest $@.manifest -outputresource:$@\;1; fi) ; exit $$RC) diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 3b9b260dbcc0..6dddac6799b8 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -452,7 +452,6 @@ DBG_LEVEL*=0 optimize!=true dbgutil!=true DBG_LEVEL*=1 -USE_DEBUG_RUNTIME*=TRUE .ENDIF .IF "$(debug)"!="" diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk index 9c700ff6754e..d10f50f99356 100644 --- a/soltools/mkdepend/makefile.mk +++ b/soltools/mkdepend/makefile.mk @@ -71,12 +71,7 @@ APP1OBJS=$(OBJFILES) APP1RPATH=NONE .IF "$(COM)"=="MSC" -.IF "$(dbgutil)"=="" APP1STDLIBS+=msvcprt.lib -.ELSE -APP1STDLIBS+=msvcprtd.lib -CDEFS+=-D_DEBUG -.ENDIF # "$(DBG_UTIL)"=="" .ENDIF # "$(COM)"=="MSC" .IF "$(OS)"=="SOLARIS" -- cgit