diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-01-09 14:59:27 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-01-09 15:02:33 +0100 |
| commit | 5d061167ee9b88628a1936041ee90c62e4dc1e18 (patch) | |
| tree | 774cb13f440f60058b5a6cbe8820f0ff8f4b0020 | |
| parent | 3757c03fc8f138427e21c41ef5e66e8c5a98159c (diff) | |
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 8ab4d2f29fdd2c058db23f6ee7b2200655d4c6f6)
Change-Id: I476fb2e4f50de5304632628b25e3997ea6c31c27
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index cb124185404d..3234a2b95867 100644 --- a/configure.ac +++ b/configure.ac @@ -4527,6 +4527,10 @@ dnl Check for syslog header dnl =================================================================== 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 =================================================================== AC_MSG_CHECKING([whether to turn warnings to errors]) diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 3d1f0f1292ce..48439f3762ba 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -133,10 +133,11 @@ ifeq ($(HARDLINKDELIVER),TRUE) gb_Deliver_HARDLINK := $(true) endif +# note: ENABLE_CRASHDUMP turns on gb_SYMBOL ifeq ($(or $(ENABLE_SYMBOLS),$(enable_symbols)),FALSE) gb_SYMBOL := $(false) else -ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)),) +ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)$(ENABLE_CRASHDUMP)),) gb_SYMBOL := $(true) endif endif diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 43c919806d32..c5804a87cf7d 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -265,11 +265,6 @@ gb_DEBUG_CFLAGS+=-FS endif # this does not use CFLAGS so it is not overridable -ifneq ($(ENABLE_CRASHDUMP),) -gb_CFLAGS+=-Zi -gb_CXXFLAGS+=-Zi -endif - ifeq ($(gb_SYMBOL),$(true)) gb_CFLAGS+=$(gb_DEBUG_CFLAGS) gb_CXXFLAGS+=$(gb_DEBUG_CFLAGS) |