Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion messages/bin_ltfsck/root.txt
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ root:table {
16087E:string { "Volume is inconsistent. Try to recover consistency with ltfsck first." }
16088I:string { "Launched by \"%s\"." }
16089I:string { "%s." }
16090I:string { "GCC version is %s." }
16090I:string { "%s version is %s." }
16091E:string { "Cannot recover missing EOD (%d)." }
16092E:string { "Cannot set up tape drive (%s)." }
16093E:string { "Cannot recover the cartridge with ltfsck." }
Expand Down
2 changes: 1 addition & 1 deletion messages/bin_mkltfs/root.txt
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ root:table {
15040I:string { "Medium unformatted successfully." }
15041I:string { "Launched by \"%s\"." }
15042I:string { "%s." }
15043I:string { "GCC version is %s." }
15043I:string { "%s version is %s." }
15044E:string { "Cannot set up tape device." }
15045E:string { "Formatting was canceled by the user." }
15046E:string { "Unformatting was canceled by the user." }
Expand Down
29 changes: 19 additions & 10 deletions src/libltfs/arch/arch_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,49 +50,58 @@
#ifndef arch_info_h_
#define arch_info_h_

#if defined(_MSC_VER)
#define BUILD_SYS_COMPILER "MSVC"
#else
#define BUILD_SYS_COMPILER "GCC"
#endif

#if defined(__linux__)

#if defined(__i386__)
#define BUILD_SYS_FOR "This binary is built for Linux (i386)"
#define BUILD_SYS_GCC __VERSION__
#define BUILD_SYS_COMPILER_VER __VERSION__
#elif defined(__x86_64__)
#define BUILD_SYS_FOR "This binary is built for Linux (x86_64)"
#define BUILD_SYS_GCC __VERSION__
#define BUILD_SYS_COMPILER_VER __VERSION__
#elif defined(__ppc__)
#define BUILD_SYS_FOR "This binary is built for Linux (ppc)"
#define BUILD_SYS_GCC __VERSION__
#define BUILD_SYS_COMPILER_VER __VERSION__
#elif defined(__ppc64__)
#define BUILD_SYS_FOR "This binary is built for Linux (ppc64)"
#define BUILD_SYS_GCC __VERSION__
#define BUILD_SYS_COMPILER_VER __VERSION__
#else
#define BUILD_SYS_FOR "This binary is built for Linux (unknown)"
#define BUILD_SYS_GCC __VERSION__
#define BUILD_SYS_COMPILER_VER __VERSION__
#endif

#elif defined(__APPLE__)

#define BUILD_SYS_FOR "This binary is built for Mac OS X "
#define BUILD_SYS_GCC __VERSION__
#define BUILD_SYS_COMPILER_VER __VERSION__

#elif defined(__FreeBSD__)

#define BUILD_SYS_FOR "This binary is built for FreeBSD"
#define BUILD_SYS_GCC __VERSION__
#define BUILD_SYS_COMPILER_VER __VERSION__

#elif defined(__NetBSD__)

#define BUILD_SYS_FOR "This binary is built for NetBSD"
#define BUILD_SYS_GCC __VERSION__
#define BUILD_SYS_COMPILER_VER __VERSION__

#elif defined(mingw_PLATFORM)

#define STR_HELPER(x) #x
#define STR_MACRO(x) STR_HELPER(x)

#define BUILD_SYS_FOR "This binary is built for Windows"
#define BUILD_SYS_GCC __VERSION__
#define BUILD_SYS_COMPILER_VER STR_MACRO(_MSC_VER)

#else

#define BUILD_SYS_FOR "This binary is built on an unknown OS"
#define BUILD_SYS_GCC __VERSION__
#define BUILD_SYS_COMPILER_VER __VERSION__

#endif

Expand Down
2 changes: 1 addition & 1 deletion src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@ int main(int argc, char **argv)

/* Show build time information */
ltfsmsg(LTFS_INFO, 14105I, BUILD_SYS_FOR);
ltfsmsg(LTFS_INFO, 14106I, BUILD_SYS_GCC);
ltfsmsg(LTFS_INFO, 14106I, BUILD_SYS_COMPILER_VER);

/* Show run time information */
show_runtime_system_info();
Expand Down
2 changes: 1 addition & 1 deletion src/utils/ltfsck.c
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ int main(int argc, char **argv)

/* Show build time information */
ltfsmsg(LTFS_INFO, 16089I, BUILD_SYS_FOR);
ltfsmsg(LTFS_INFO, 16090I, BUILD_SYS_GCC);
ltfsmsg(LTFS_INFO, 16090I, BUILD_SYS_COMPILER, BUILD_SYS_COMPILER_VER);

/* Show run time information */
show_runtime_system_info();
Expand Down
2 changes: 1 addition & 1 deletion src/utils/mkltfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ int main(int argc, char **argv)

/* Show build time information */
ltfsmsg(LTFS_INFO, 15042I, BUILD_SYS_FOR);
ltfsmsg(LTFS_INFO, 15043I, BUILD_SYS_GCC);
ltfsmsg(LTFS_INFO, 15043I, BUILD_SYS_COMPILER, BUILD_SYS_COMPILER_VER);

/* Show run time information */
show_runtime_system_info();
Expand Down
Loading