Output the compiler id in --version.

CMakeLists.txt

@@ -313,8 +313,8 @@ set(TARANTOOL_OPTIONS "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
 set(TARANTOOL_OPTIONS "${TARANTOOL_OPTIONS} -DENABLE_STATIC=${ENABLE_STATIC} -DENABLE_GCOV=${ENABLE_GCOV}")
 set(TARANTOOL_OPTIONS "${TARANTOOL_OPTIONS} -DENABLE_TRACE=${ENABLE_TRACE} -DENABLE_BACKTRACE=${ENABLE_BACKTRACE}")
 set(TARANTOOL_OPTIONS "${TARANTOOL_OPTIONS} -DENABLE_CLIENT=${ENABLE_CLIENT}")
-
 set(TARANTOOL_BUILD "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_BUILD_TYPE}")
+set(TARANTOOL_COMPILER ${CMAKE_C_COMPILER})
 
 #
 # Output compile-time defines into config.h. Do it at the end
@@ -338,6 +338,7 @@ message (STATUS "Tarantool configuration is complete:")
 message (STATUS "")
 message (STATUS "VERSION: ${TARANTOOL_VERSION}")
 message (STATUS "BUILD: ${TARANTOOL_BUILD}")
+message (STATUS "COMPILER: ${TARANTOOL_COMPILER}")
 message (STATUS "CFLAGS:${CMAKE_C_FLAGS} ${core_cflags}")
 message (STATUS "PREFIX: ${CMAKE_INSTALL_PREFIX}")
 message (STATUS "MODULES: ${TARANTOOL_MODULES}")

include/config.h.cmake

@@ -79,8 +79,9 @@
 #define INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
 #define BUILD_TYPE "@CMAKE_BUILD_TYPE@"
 #define BUILD_INFO "@TARANTOOL_BUILD@"
-#define BUILD_CFLAGS "@CMAKE_C_FLAGS@ @core_cflags@"
 #define BUILD_OPTIONS "cmake . @TARANTOOL_OPTIONS@"
+#define COMPILER_INFO "@TARANTOOL_COMPILER@"
+#define COMPILER_CFLAGS "@CMAKE_C_FLAGS@ @core_cflags@"
 /*
  * vim: syntax=c
  */

src/tarantool.m

@@ -547,7 +547,8 @@ main(int argc, char **argv)
 		printf("Tarantool/%s %s\n", mod_name, tarantool_version());
 		printf("Target: %s\n", BUILD_INFO);
 		printf("Build options: %s\n", BUILD_OPTIONS);
-		printf("CFLAGS:%s\n", BUILD_CFLAGS);
+		printf("Compiler: %s\n", COMPILER_INFO);
+		printf("CFLAGS:%s\n", COMPILER_CFLAGS);
 		return 0;
 	}
 

test/box/args.result

@@ -77,12 +77,14 @@ tarantool_box --version
 Tarantool/Box 1.minor.patch-<rev>-<commit>
 Target: platform <build>
 Build options: flags
+Compiler: cc
 CFLAGS: flags
 
 tarantool_box -V
 Tarantool/Box 1.minor.patch-<rev>-<commit>
 Target: platform <build>
 Build options: flags
+Compiler: cc
 CFLAGS: flags
 
 #

test/box/args.test

@@ -30,6 +30,7 @@ sys.stdout.push_filter("(\d)\.\d\.\d(-\d+-\w+)?", "\\1.minor.patch-<rev>-<commit
 sys.stdout.push_filter("Target: .*", "Target: platform <build>")
 sys.stdout.push_filter("Build options: .*", "Build options: flags")
 sys.stdout.push_filter("CFLAGS: .*", "CFLAGS: flags")
+sys.stdout.push_filter("Compiler: .*", "Compiler: cc")
 
 server.test_option("--version")
 server.test_option("-V          ")