diff --git a/CMakeLists.txt b/CMakeLists.txt index dc2ac93527ea1f78a7a8f41af0832096d13e000d..16784c1d5b90c8a88aa8d9388a4a6daa5b44ff75 100644 --- a/CMakeLists.txt +++ b/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}") diff --git a/include/config.h.cmake b/include/config.h.cmake index 2db3b8115c96309b13a12e09f7bb8d06d9a3ff1e..bdceae95f74074cfaa62ff8080820e13bfb55bda 100644 --- a/include/config.h.cmake +++ b/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 */ diff --git a/src/tarantool.m b/src/tarantool.m index 9f1d8ec08a9d49d637bf94153acc5ef897a09803..74a6175bfb1d77c02f334ba352c54fe92ee628c6 100644 --- a/src/tarantool.m +++ b/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; } diff --git a/test/box/args.result b/test/box/args.result index 5116166ab5b7af63bf2582217e8b76d171bfce4d..120ed0c33883272a018ed7a655dd3940bcfb2352 100644 --- a/test/box/args.result +++ b/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 # diff --git a/test/box/args.test b/test/box/args.test index c79cb4d62a5f1c8ab72c47d33ef80ec2a0493562..10bb598e48b6c46d2c7cc7ee0b32578502401a01 100644 --- a/test/box/args.test +++ b/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 ")