Merge pull request #866 from landstander668/add_platform

Add reporting of build platform
This commit is contained in:
Johannes Schindelin
2016-10-25 18:10:04 +02:00
2 changed files with 16 additions and 0 deletions

3
help.c
View File

@@ -429,6 +429,8 @@ const char *help_unknown_cmd(const char *cmd)
int cmd_version(int argc, const char **argv, const char *prefix)
{
static char build_platform[] = GIT_BUILD_PLATFORM;
/*
* The format of this string should be kept stable for compatibility
* with external projects that rely on the output of "git version".
@@ -437,6 +439,7 @@ int cmd_version(int argc, const char **argv, const char *prefix)
while (*++argv) {
if (!strcmp(*argv, "--build-options")) {
printf("sizeof-long: %d\n", (int)sizeof(long));
printf("machine: %s\n", build_platform);
/* NEEDSWORK: also save and output GIT-BUILD_OPTIONS? */
}
}

13
help.h
View File

@@ -33,3 +33,16 @@ extern void list_commands(unsigned int colopts, struct cmdnames *main_cmds, stru
*/
extern void help_unknown_ref(const char *ref, const char *cmd, const char *error);
#endif /* HELP_H */
/*
* identify build platform
*/
#ifndef GIT_BUILD_PLATFORM
#if defined __x86__ || defined __i386__ || defined __i586__ || defined __i686__
#define GIT_BUILD_PLATFORM "x86";
#elif defined __x86_64__
#define GIT_BUILD_PLATFORM "x86_64";
#else
#define GIT_BUILD_PLATFORM "unknown";
#endif
#endif