diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-20 20:11:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-20 20:11:49 (GMT) |
| commit | 551fc7aec1a7efe868a59fbeea14582b41923f4d (patch) | |
| tree | d61c1f84583a496e2a4276c840fe4a8b867f9487 /Makefile | |
| parent | ec0465ade87996214959a393239eec520daf92ea (diff) | |
| parent | a25b5a32c76630f2433b860fef7bc28a9380a8f6 (diff) | |
| download | git-551fc7aec1a7efe868a59fbeea14582b41923f4d.zip git-551fc7aec1a7efe868a59fbeea14582b41923f4d.tar.gz git-551fc7aec1a7efe868a59fbeea14582b41923f4d.tar.bz2 | |
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-- | Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -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 |