summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMatt Oliver <protogonoi@gmail.com>2014-05-11 17:40:20 +1000
committerMartin Storsjö <martin@martin.st>2015-05-02 22:11:36 +0300
commit3edeb7749e4276c78ad57307b8c3b32dd476d1da (patch)
treefb824abac74cfe1076c64dc121516b632b59ed69 /configure
parent863ee06809b215895ee20cbc557eeceb904cf770 (diff)
configure: Allow log2 with MSVC 2013 onwards.
Only MSVC 2010 in x64 mode, in the static msvcrt, had a stray log2 function (which wasn't available in the headers). MSVC 2013 has got a proper log2 function though. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 6bfd30435c..f3e51544b9 100755
--- a/configure
+++ b/configure
@@ -1744,8 +1744,6 @@ fast_unaligned_if_any="aarch64 ppc x86"
simd_align_16_if_any="altivec neon sse"
# system capabilities
-log2_deps="!libc_msvcrt"
-
symver_if_any="symver_asm_label symver_gnu_asm"
valgrind_backtrace_deps="!optimizations valgrind_valgrind_h"
@@ -4563,6 +4561,8 @@ elif enabled_any msvc icl; then
# not supported (build will fail)
disable inline_asm
fi
+ # msvcrt10 x64 incorrectly enables log2, only msvcrt12 (MSVC 2013) onwards actually has log2.
+ check_cpp_condition crtversion.h "_VC_CRT_MAJOR_VERSION >= 12" || disable log2
fi
case $as_type in