fixup config.mak.uname

Signed-off-by: Jeff Hostetler <jeffhostetler@github.com>

config.mak.uname

@@ -143,6 +143,8 @@ ifeq ($(uname_S),Darwin)
 	COMPAT_OBJS += compat/precompose_utf8.o
 	BASIC_CFLAGS += -DPRECOMPOSE_UNICODE
 	BASIC_CFLAGS += -DPROTECT_HFS_DEFAULT=1
+	# Create universal binaries. HOST_CPU is a bit of a lie and only
+	# used in `git version --build-options`.  We'll fix that in code.
 	BASIC_CFLAGS += -arch arm64 -arch x86_64
 	HOST_CPU += universal
 	HAVE_BSD_SYSCTL = YesPlease

help.c

@@ -730,6 +730,20 @@ const char *help_unknown_cmd(const char *cmd)
 	exit(1);
 }
 
+static const char *git_host_cpu(void) {
+#if defined(__APPLE__)
+	if (!strcmp(GIT_HOST_CPU, "universal")) {
+#if defined(__x86_64__)
+		return "x86_64";
+#elif defined(__aarch64__)
+		return "arm64";
+#endif
+	}
+#endif
+
+	return GIT_HOST_CPU;
+}
+
 void get_version_info(struct strbuf *buf, int show_build_options)
 {
 	/*
@@ -741,7 +755,7 @@ void get_version_info(struct strbuf *buf, int show_build_options)
 	strbuf_addf(buf, "git version %s\n", git_version_string);
 
 	if (show_build_options) {
-		strbuf_addf(buf, "cpu: %s\n", GIT_HOST_CPU);
+		strbuf_addf(buf, "cpu: %s\n", git_host_cpu());
 		if (git_built_from_commit_string[0])
 			strbuf_addf(buf, "built from commit: %s\n",
 			       git_built_from_commit_string);