From 66022254f1cb80c4446286347b5225ee65839655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20R=C3=B6nnquist?= <unknown>
Date: Thu, 30 Jul 2020 16:00:10 +1000
Subject: Bug [#2191]. Allow setting CPPFLAGS to support hardening.

---
 doc/ScintillaHistory.html | 4 ++++
 gtk/makefile              | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 363608563..ff7655a29 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -585,6 +585,10 @@
 	<a href="https://sourceforge.net/p/scintilla/bugs/2189/">Bug #2189</a>.
 	</li>
 	<li>
+	On GTK, allow setting CPPFLAGS (and LDFLAGS for SciTE) to support hardening.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2191/">Bug #2191</a>.
+	</li>
+	<li>
 	Fixed a bug in SciTE with stack balance when a syntax error in the Lua startup script
 	caused continuing failures to find functions after the syntax error was corrected.
 	<a href="https://sourceforge.net/p/scintilla/bugs/2176/">Bug #2176</a>.
diff --git a/gtk/makefile b/gtk/makefile
index 6724f7ae0..dc04d4e8a 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -106,9 +106,9 @@ clean:
 	$(DEL) *.o $(call normalize,$(COMPLIB)) $(call normalize,$(COMPONENT)) *.plist
 
 %.o: %.cxx
-	$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -c $<
+	$(CXX) $(CPPFLAGS) $(CXX_ALL_FLAGS) $(CXXFLAGS) -c $<
 %.o: %.c
-	$(CC) $(DEFINES) $(INCLUDES) $(CONFIG_FLAGS) $(BASE_FLAGS) $(CFLAGS) -w -c $<
+	$(CC) $(CPPFLAGS) $(DEFINES) $(INCLUDES) $(CONFIG_FLAGS) $(BASE_FLAGS) $(CFLAGS) -w -c $<
 
 GLIB_GENMARSHAL = glib-genmarshal
 GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal
-- 
cgit v1.2.3