From 70289a879f7a48a47dd0219cc5d3a9a1dee076a8 Mon Sep 17 00:00:00 2001
From: Jens Lody <jens@codeblocks.org>
Date: Wed, 27 Jul 2016 02:09:07 +0200
Subject: Workaround for gcc6 optimization bug.


diff --git a/configure.ac b/configure.ac
index 7f80a3f..f178ee2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -276,6 +276,7 @@ esac
 
 CB_GCC_VERSION
 AM_CONDITIONAL([HAVE_GCC48], [test $GCC_MAJOR_VERSION -gt 4 -o $GCC_MAJOR_VERSION -eq 4 -a $GCC_MINOR_VERSION -ge 8])
+AM_CONDITIONAL([HAVE_GCC6], [test $GCC_MAJOR_VERSION -ge 6])
 
 AC_MSG_CHECKING([for wxWidgets >= 2.9.0])
 AM_CONDITIONAL([HAVE_WX29], [test $wx_config_major_version -gt 2 -o $wx_config_major_version -eq 2 -a $wx_config_minor_version -ge 9])
diff --git a/src/sdk/wxpropgrid/Makefile.am b/src/sdk/wxpropgrid/Makefile.am
index 2b1a107..f427fb4 100644
--- a/src/sdk/wxpropgrid/Makefile.am
+++ b/src/sdk/wxpropgrid/Makefile.am
@@ -3,6 +3,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \
 		-DEXPORT_LIB \
 		-DwxPG_SUPPORT_TOOLTIPS
 
+if HAVE_GCC6
+AM_CPPFLAGS += -fno-delete-null-pointer-checks
+endif
+
 noinst_LTLIBRARIES = libwxpropgrid.la
 
 libwxpropgrid_la_SOURCES = ./src/advprops.cpp \