diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-20 18:06:46 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-20 18:08:08 +0200 |
| commit | 7d3c674a0444e7688178b00ae4675bb65c685798 (patch) | |
| tree | c24d4262dffc8b2fb98aef9bfdcf6e67b893faa8 /solenv | |
| parent | 29b6eda7e5909106d8325f75b3ae0cda579385b5 (diff) | |
Abandon attempt to use the debug CRT in a dbgutil build
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild_simple.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_MSC.mk | 3 | ||||
| -rw-r--r-- | solenv/inc/settings.mk | 1 |
4 files changed, 5 insertions, 5 deletions
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)"!="" |