diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-19 17:22:14 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-19 17:58:59 +0300 |
| commit | 691f53959e3ec034cedcd15c3f7044a141b42878 (patch) | |
| tree | d8063b6e6d4be55aa6edc6278de7affcd424acfa /solenv | |
| parent | 9cf309c4f0c85a1db0f470b389a1e4a1752204f0 (diff) | |
Use -NODEFAULTLIB for dbgutil build and link with kernel32 and user32
This avoids warnings about linking both with normal and debugging
runtime. Matches more closely what the old build system does.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 875b43195aea..6ca1178e085d 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -383,11 +383,12 @@ $(call gb_Helper_abbreviate_dirs_native,\ $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ $(if $(filter YES,$(gb_Executable_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 $(gb_PRODUCT),,msvcrtd.lib msvcprtd.lib) \ + $(if $(gb_PRODUCT),,msvcrtd.lib msvcprtd.lib kernel32.lib user32.lib) \ $(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); RC=$$?; rm $${RESPONSEFILE} \ $(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) ; exit $$RC) endef |