Merge pull request #17461 from rasendubi/powerpc

cross-compilation: fixes for powerpc-linux-uclibc
This commit is contained in:
obadz 2016-08-11 00:51:51 +01:00 committed by GitHub
commit 1cd9c58834
5 changed files with 11 additions and 1 deletions

View File

@ -7,7 +7,7 @@ mkdir $out/nix-support
# Force gcc to use ld-wrapper.sh when calling ld.
cflagsCompile="-B$out/bin/"
if test -z "$nativeLibc"; then
if test -z "$nativeLibc" -a -n "$libc"; then
cflagsCompile="$cflagsCompile -B$gccLibs/lib -B$libc/lib/ -isystem $libc/include"
ldflags="$ldflags -L$libc/lib"
# Get the proper dynamic linker for glibc and uclibc.

View File

@ -189,6 +189,9 @@ let version = "4.9.4";
# To keep ABI compatibility with upstream mingw-w64
" --enable-fully-dynamic-string"
else (if cross.libc == "uclibc" then
# libsanitizer requires netrom/netrom.h which is not
# available in uclibc.
" --disable-libsanitizer" +
# In uclibc cases, libgomp needs an additional '-ldl'
# and as I don't know how to pass it, I disable libgomp.
" --disable-libgomp" else "") +

View File

@ -189,6 +189,9 @@ let version = "5.4.0";
# To keep ABI compatibility with upstream mingw-w64
" --enable-fully-dynamic-string"
else (if cross.libc == "uclibc" then
# libsanitizer requires netrom/netrom.h which is not
# available in uclibc.
" --disable-libsanitizer" +
# In uclibc cases, libgomp needs an additional '-ldl'
# and as I don't know how to pass it, I disable libgomp.
" --disable-libgomp" else "") +

View File

@ -188,6 +188,9 @@ let version = "6.1.0";
# To keep ABI compatibility with upstream mingw-w64
" --enable-fully-dynamic-string"
else (if cross.libc == "uclibc" then
# libsanitizer requires netrom/netrom.h which is not
# available in uclibc.
" --disable-libsanitizer" +
# In uclibc cases, libgomp needs an additional '-ldl'
# and as I don't know how to pass it, I disable libgomp.
" --disable-libgomp" else "") +

View File

@ -104,6 +104,7 @@ stdenv.mkDerivation {
meta = {
homepage = http://www.uclibc.org/;
description = "A small implementation of the C library";
maintainers = with stdenv.lib.maintainers; [ rasendubi ];
license = stdenv.lib.licenses.lgpl2;
platforms = stdenv.lib.platforms.linux;
};