summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-01-31 00:43:18 +0100
committerDiego Biurrun <diego@biurrun.de>2013-01-31 11:19:23 +0100
commit29f1fa74225e9fdbab6d590857edbecb51cf74da (patch)
tree6c07e5df274daf609dbeb7de2d739730a84225cf /configure
parent0f5b0b4178b844fcab82222109d0be00ab73c185 (diff)
configure: Move newlib libc check before mingw libc check
On Cygwin systems MinGW headers can be present if the corresponding packages have been installed. Since the MinGW libc is checked for first, this results in newlib getting misdetected as MinGW libc.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 4 insertions, 3 deletions
diff --git a/configure b/configure
index 77600ef2b5..c41a396f3e 100755
--- a/configure
+++ b/configure
@@ -3041,15 +3041,16 @@ if check_cpp_condition features.h "defined __UCLIBC__"; then
elif check_cpp_condition features.h "defined __GLIBC__"; then
libc_type=glibc
add_cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600
+# MinGW headers can be installed on Cygwin, so check for newlib first.
+elif check_cpp_condition newlib.h "defined _NEWLIB_VERSION"; then
+ libc_type=newlib
+ add_cppflags -U__STRICT_ANSI__
elif check_header _mingw.h; then
libc_type=mingw
check_cpp_condition _mingw.h \
"defined (__MINGW64_VERSION_MAJOR) || (__MINGW32_MAJOR_VERSION > 3) || \
(__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" ||
die "ERROR: MinGW runtime version must be >= 3.15."
-elif check_cpp_condition newlib.h "defined _NEWLIB_VERSION"; then
- libc_type=newlib
- add_cppflags -U__STRICT_ANSI__
elif check_func_headers stdlib.h _get_doserrno; then
libc_type=msvcrt
add_compat strtod.o strtod=avpriv_strtod