diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 20:38:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 20:45:26 +0100 |
| commit | 3a5cbc91a45a8524dcf8c68c6ab54412f95f87a2 (patch) | |
| tree | e188c2467e124d8f6bea3ac95f0ff8fb68445d08 | |
| parent | 8c677a9f06c5d145da0301cdc3c6bff9ebacb5d7 (diff) | |
| parent | 61b203ffe6c71789acb14f51483d63fe9e516842 (diff) | |
| download | ffmpeg-3a5cbc91a45a8524dcf8c68c6ab54412f95f87a2.tar.gz | |
Merge commit '61b203ffe6c71789acb14f51483d63fe9e516842'
* commit '61b203ffe6c71789acb14f51483d63fe9e516842':
configure: detect Solaris libc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -3600,7 +3600,6 @@ case $target_os in SHFLAGS='-shared -Wl,-h,$$(@F)' enabled x86 && SHFLAGS="-mimpure-text $SHFLAGS" network_extralibs="-lsocket -lnsl" - add_cppflags -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 # When using suncc to build, the Solaris linker will mark # an executable with each instruction set encountered by # the Solaris assembler. As our libraries contain their own @@ -3850,6 +3849,9 @@ elif check_cpp_condition stddef.h "defined __KLIBC__"; then libc_type=klibc elif check_cpp_condition sys/cdefs.h "defined __BIONIC__"; then 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 test -n "$libc_type" && enable $libc_type |