diff options
| author | Andreas Rönnquist <unknown> | 2020-07-30 16:00:10 +1000 |
|---|---|---|
| committer | Andreas Rönnquist <unknown> | 2020-07-30 16:00:10 +1000 |
| commit | 0ddb82e9997740c4e73724889f814de324deadfc (patch) | |
| tree | 338d6dad43d6f3a4c3e5c144f1b27572d2351791 | |
| parent | f24358179685d9ecbc897543488ad56fa9e3a485 (diff) | |
| download | scintilla-mirror-0ddb82e9997740c4e73724889f814de324deadfc.tar.gz | |
Backport: Bug [#2191]. Allow setting CPPFLAGS to support hardening.
Backport of changeset 8466:5d134721c303.
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | gtk/makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 217254f1a..ab887fcb6 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -575,6 +575,10 @@ Allow cross-building for GTK by choosing pkg-config. <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> </ul> <h3> <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.21.0/scintilla3210.zip/download">Release 3.21.0</a> diff --git a/gtk/makefile b/gtk/makefile index 1117a420c..754fc9a1a 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -99,9 +99,9 @@ clean: $(DEL) *.o $(call normalize,$(COMPLIB)) *.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 $< $(LUA_OBJS): %.o: ../lua/src/%.c $(CC) $(LUA_CFLAGS) $(CFLAGS) -c $< |