Kaydet (Commit) 5d061167 authored tarafından Michael Stahl's avatar Michael Stahl

gbuild: try to fix windows non-debug builds

The ENABLE_CRASHREP is no longer AC_SUBSTed by configure, so it is
always non-empty in config_host.mk, resulting in -Zi without -FS,
which breaks MSVC 2013 builds.

Leave a placeholder in configure for the new crash reporter vaporware,
and force the CFLAGS to be the same as in the --eanble-symbols case.

(regression from 8ab4d2f2)

Change-Id: I476fb2e4f50de5304632628b25e3997ea6c31c27
üst 3757c03f
...@@ -4527,6 +4527,10 @@ dnl Check for syslog header ...@@ -4527,6 +4527,10 @@ dnl Check for syslog header
dnl =================================================================== dnl ===================================================================
AC_CHECK_HEADER(syslog.h, AC_DEFINE(HAVE_SYSLOG_H)) AC_CHECK_HEADER(syslog.h, AC_DEFINE(HAVE_SYSLOG_H))
# placeholder for future crash reporter feature
ENABLE_CRASHDUMP=""
AC_SUBST(ENABLE_CRASHDUMP)
dnl Set the ENABLE_WERROR variable. (Activate --enable-werror) dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
dnl =================================================================== dnl ===================================================================
AC_MSG_CHECKING([whether to turn warnings to errors]) AC_MSG_CHECKING([whether to turn warnings to errors])
......
...@@ -133,10 +133,11 @@ ifeq ($(HARDLINKDELIVER),TRUE) ...@@ -133,10 +133,11 @@ ifeq ($(HARDLINKDELIVER),TRUE)
gb_Deliver_HARDLINK := $(true) gb_Deliver_HARDLINK := $(true)
endif endif
# note: ENABLE_CRASHDUMP turns on gb_SYMBOL
ifeq ($(or $(ENABLE_SYMBOLS),$(enable_symbols)),FALSE) ifeq ($(or $(ENABLE_SYMBOLS),$(enable_symbols)),FALSE)
gb_SYMBOL := $(false) gb_SYMBOL := $(false)
else else
ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)),) ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)$(ENABLE_CRASHDUMP)),)
gb_SYMBOL := $(true) gb_SYMBOL := $(true)
endif endif
endif endif
......
...@@ -265,11 +265,6 @@ gb_DEBUG_CFLAGS+=-FS ...@@ -265,11 +265,6 @@ gb_DEBUG_CFLAGS+=-FS
endif endif
# this does not use CFLAGS so it is not overridable # this does not use CFLAGS so it is not overridable
ifneq ($(ENABLE_CRASHDUMP),)
gb_CFLAGS+=-Zi
gb_CXXFLAGS+=-Zi
endif
ifeq ($(gb_SYMBOL),$(true)) ifeq ($(gb_SYMBOL),$(true))
gb_CFLAGS+=$(gb_DEBUG_CFLAGS) gb_CFLAGS+=$(gb_DEBUG_CFLAGS)
gb_CXXFLAGS+=$(gb_DEBUG_CFLAGS) gb_CXXFLAGS+=$(gb_DEBUG_CFLAGS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment