summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-20 13:11:49 -0700
committerJunio C Hamano <gitster@pobox.com>2015-03-20 13:11:49 -0700
commit551fc7aec1a7efe868a59fbeea14582b41923f4d (patch)
treed61c1f84583a496e2a4276c840fe4a8b867f9487 /Makefile
parentec0465ade87996214959a393239eec520daf92ea (diff)
parenta25b5a32c76630f2433b860fef7bc28a9380a8f6 (diff)
downloadgit-551fc7aec1a7efe868a59fbeea14582b41923f4d.tar.gz
Merge branch 'km/bsd-sysctl'
We now detect number of CPUs on older BSD-derived systems. * km/bsd-sysctl: thread-utils.c: detect CPU count on older BSD-like systems configure: support HAVE_BSD_SYSCTL option
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 44f1dd10ff..5f3987fe3b 100644
--- a/Makefile
+++ b/Makefile
@@ -357,6 +357,8 @@ all::
# and define it to "no" if you need to remove the parentheses () around the
# constant. The default is "auto", which means to use parentheses if your
# compiler is detected to support it.
+#
+# Define HAVE_BSD_SYSCTL if your platform has a BSD-compatible sysctl function.
GIT-VERSION-FILE: FORCE
@$(SHELL_PATH) ./GIT-VERSION-GEN
@@ -1431,6 +1433,10 @@ ifdef HAVE_CLOCK_MONOTONIC
BASIC_CFLAGS += -DHAVE_CLOCK_MONOTONIC
endif
+ifdef HAVE_BSD_SYSCTL
+ BASIC_CFLAGS += -DHAVE_BSD_SYSCTL
+endif
+
ifeq ($(TCLTK_PATH),)
NO_TCLTK = NoThanks
endif