Commit 3a5cbc91 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '61b203ff'

* commit '61b203ff':
  configure: detect Solaris libc
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 8c677a9f 61b203ff
...@@ -3600,7 +3600,6 @@ case $target_os in ...@@ -3600,7 +3600,6 @@ case $target_os in
SHFLAGS='-shared -Wl,-h,$$(@F)' SHFLAGS='-shared -Wl,-h,$$(@F)'
enabled x86 && SHFLAGS="-mimpure-text $SHFLAGS" enabled x86 && SHFLAGS="-mimpure-text $SHFLAGS"
network_extralibs="-lsocket -lnsl" network_extralibs="-lsocket -lnsl"
add_cppflags -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
# When using suncc to build, the Solaris linker will mark # When using suncc to build, the Solaris linker will mark
# an executable with each instruction set encountered by # an executable with each instruction set encountered by
# the Solaris assembler. As our libraries contain their own # the Solaris assembler. As our libraries contain their own
...@@ -3850,6 +3849,9 @@ elif check_cpp_condition stddef.h "defined __KLIBC__"; then ...@@ -3850,6 +3849,9 @@ elif check_cpp_condition stddef.h "defined __KLIBC__"; then
libc_type=klibc libc_type=klibc
elif check_cpp_condition sys/cdefs.h "defined __BIONIC__"; then elif check_cpp_condition sys/cdefs.h "defined __BIONIC__"; then
libc_type=bionic libc_type=bionic
elif check_cpp_condition sys/brand.h "defined SOLARIS_BRAND_NAME"; then
libc_type=solaris
add_cppflags -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
fi fi
test -n "$libc_type" && enable $libc_type test -n "$libc_type" && enable $libc_type
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment