From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 7 Mar 2019 14:36:33 -0500
Subject: Avoid clobbering CXX flags when compiling lua-aho-corasick

Without this patch, any externally-set CXXFLAGS are not passed through
to the underlying C++ compiler.

---
 modules/policy/policy.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/policy/policy.mk b/modules/policy/policy.mk
index 98c9f88..43964dd 100644
--- a/modules/policy/policy.mk
+++ b/modules/policy/policy.mk
@@ -7,7 +7,7 @@ $(call make_lua_module,policy)
 policy-clean:
 	$(MAKE) -C $(AHOCORASICK_DIR) clean
 $(AHOCORASICK_DIR)ahocorasick$(LIBEXT): $(AHOCORASICK_DIR)Makefile
-	$(MAKE) -C $(AHOCORASICK_DIR) ahocorasick$(LIBEXT) CXXFLAGS="$(lua_CFLAGS)"
+	$(MAKE) -C $(AHOCORASICK_DIR) ahocorasick$(LIBEXT) CXXFLAGS="$(lua_CFLAGS) $(CXXFLAGS)"
 
 policy-install: ahocorasick-install
 ahocorasick-install: $(AHOCORASICK_DIR)ahocorasick$(LIBEXT) $(DESTDIR)$(MODULEDIR)
