Rename template variable cc -> cxx

3 files changed, 3 insertions, 4 deletions

diff --git a/configure.py b/configure.py
index 279bd0e56..31d44a4cf 100755
--- a/configure.py
+++ b/configure.py
@@ -1273,7 +1273,7 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
 
         'mp_bits': choose_mp_bits(),
 
-        'cc': (options.compiler_binary or cc.binary_name) + cc.mach_abi_link_flags(options),
+        'cxx': (options.compiler_binary or cc.binary_name) + cc.mach_abi_link_flags(options),
 
         'lib_opt': cc.opt_flags('lib', options),
         'app_opt': cc.opt_flags('app', options),
diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in
index c83e3fcd1..5db2ce566 100644
--- a/src/build-data/buildh.in
+++ b/src/build-data/buildh.in
@@ -1,4 +1,3 @@
-
 #ifndef BOTAN_BUILD_CONFIG_H__
 #define BOTAN_BUILD_CONFIG_H__
 
@@ -7,7 +6,7 @@
 * %{user}@%{hostname} running '%{command_line}'
 *
 * Target
-*  - Compiler: %{cc} %{lib_opt}
+*  - Compiler: %{cxx} %{lib_opt}
 *  - Arch: %{submodel}/%{arch}
 *  - OS: %{os}
 */
diff --git a/src/build-data/makefile/header.in b/src/build-data/makefile/header.in
index b0e248ebe..d821361f6 100644
--- a/src/build-data/makefile/header.in
+++ b/src/build-data/makefile/header.in
@@ -1,5 +1,5 @@
 # Compiler Options
-CXX            = %{cc}
+CXX            = %{cxx}
 LIB_OPT        = %{lib_opt}
 APP_OPT        = %{app_opt}
 LANG_FLAGS     = %{lang_flags}