Split the language flags out of CXXFLAGS

Allows distributor to override CFLAGS without having to worry
about what -std=c++xx options we are using. See GH #1237

2 files changed, 5 insertions, 4 deletions

diff --git a/src/build-data/makefile/gmake_fuzzers.in b/src/build-data/makefile/gmake_fuzzers.in
index 62f7cdd29..61acdad4d 100644
--- a/src/build-data/makefile/gmake_fuzzers.in
+++ b/src/build-data/makefile/gmake_fuzzers.in
@@ -3,7 +3,7 @@
 
 FUZZER_LINK_CMD = %{fuzzer_link_cmd}
 FUZZER_LINKS_TO = %{link_to_botan} $(LIB_LINKS_TO) %{fuzzer_libs}
-FUZZER_FLAGS    = $(CXXFLAGS) $(WARN_FLAGS)
+FUZZER_FLAGS    = $(LANG_FLAGS) $(CXXFLAGS) $(WARN_FLAGS)
 
 %{fuzzer_build_cmds}
 
diff --git a/src/build-data/makefile/header.in b/src/build-data/makefile/header.in
index 6757abbad..9929bc4ba 100644
--- a/src/build-data/makefile/header.in
+++ b/src/build-data/makefile/header.in
@@ -4,6 +4,7 @@ LINKER         = %{linker}
 
 PYTHON_EXE     = %{python_exe}
 
+LANG_FLAGS     = %{cc_lang_flags}
 CXXFLAGS       = %{cc_compile_flags}
 WARN_FLAGS     = %{cc_warning_flags}
 SO_OBJ_FLAGS   = %{shared_flags}
@@ -16,9 +17,9 @@ LIB_LINKS_TO   = %{link_to}
 CLI_LINKS_TO   = %{link_to_botan} $(LIB_LINKS_TO)
 TEST_LINKS_TO  = %{link_to_botan} $(LIB_LINKS_TO)
 
-LIB_FLAGS      = $(SO_OBJ_FLAGS) $(CXXFLAGS) $(WARN_FLAGS)
-CLI_FLAGS      = $(CXXFLAGS) $(WARN_FLAGS)
-TEST_FLAGS     = $(CXXFLAGS) $(WARN_FLAGS)
+LIB_FLAGS      = $(SO_OBJ_FLAGS) $(LANG_FLAGS) $(CXXFLAGS) $(WARN_FLAGS)
+CLI_FLAGS      = $(LANG_FLAGS) $(CXXFLAGS) $(WARN_FLAGS)
+TEST_FLAGS     = $(LANG_FLAGS) $(CXXFLAGS) $(WARN_FLAGS)
 
 SCRIPTS_DIR    = %{scripts_dir}
 INSTALLED_LIB_DIR = %{prefix}/%{libdir}