Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add reporting of build platform #866

Merged
merged 1 commit into from
Sep 1, 2016
Merged

Add reporting of build platform #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions help.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,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".
Expand All @@ -431,6 +433,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? */
}
}
Expand Down
13 changes: 13 additions & 0 deletions help.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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