a263cb814e
- Stating better the guile dependencies (native/host) for guile to build - Fixing cross-linking, through --rpath-link (ld(1) explains well about it - Made gcc call the linker and the assembler through the gcc wrapper instead of directly. I thought this was the source of missing -rpath's, but the source of the problem ended up being the lack of --rpath-link. But I think the native gcc calls the wrapped ld and as, so let's do the same cross compiling. - Removed the binutilsCross from the glibc expressions. Now they are built using the gcc-cross-wrapper, and they were built with the direct gcc and binutils before this change. - I think patchelf and strip don't break the cross-compiled binaries, so I reallow them on cross compilation. - I disable the checkPhase on cross compilation. This made gmp and libtool fail when cross compiled, iirc. svn path=/nixpkgs/branches/stdenv-updates/; revision=18498
94 lines
2.4 KiB
Bash
94 lines
2.4 KiB
Bash
source $stdenv/setup
|
|
|
|
|
|
# Force gcc to use ld-wrapper.sh when calling ld.
|
|
cflagsCompile="-B$out/bin/"
|
|
|
|
if test -z "$nativeLibc"; then
|
|
cflagsCompile="$cflagsCompile -B$libc/lib/ -isystem $libc/include"
|
|
ldflags="$ldflags -L$libc/lib"
|
|
ldflagsBefore="-dynamic-linker $libc/lib/ld-linux.so.?"
|
|
#ldflagsBefore="-dynamic-linker $libc/lib/ld-uClibc.so.0"
|
|
fi
|
|
|
|
if test -n "$nativeTools"; then
|
|
gccPath="$nativePrefix/bin"
|
|
ldPath="$nativePrefix/bin"
|
|
else
|
|
ldflags="$ldflags -L$gcc/lib"
|
|
gccPath="$gcc/bin"
|
|
ldPath="$binutils/$crossConfig/bin"
|
|
fi
|
|
|
|
|
|
mkdir $out
|
|
mkdir $out/bin
|
|
mkdir $out/nix-support
|
|
|
|
|
|
doSubstitute() {
|
|
local src=$1
|
|
local dst=$2
|
|
substitute "$src" "$dst" \
|
|
--subst-var "out" \
|
|
--subst-var "shell" \
|
|
--subst-var "gcc" \
|
|
--subst-var "gccProg" \
|
|
--subst-var "binutils" \
|
|
--subst-var "libc" \
|
|
--subst-var "cflagsCompile" \
|
|
--subst-var "cflagsLink" \
|
|
--subst-var "ldflags" \
|
|
--subst-var "ldflagsBefore" \
|
|
--subst-var "ldPath" \
|
|
--subst-var-by "ld" "$ldPath/ld"
|
|
}
|
|
|
|
|
|
# Make wrapper scripts around gcc, g++, and g77. Also make symlinks
|
|
# cc, c++, and f77.
|
|
mkGccWrapper() {
|
|
local dst=$1
|
|
local src=$2
|
|
|
|
if ! test -f "$src"; then
|
|
echo "$src does not exist (skipping)"
|
|
return
|
|
fi
|
|
|
|
gccProg="$src"
|
|
doSubstitute "$gccWrapper" "$dst"
|
|
chmod +x "$dst"
|
|
}
|
|
|
|
mkGccWrapper $out/bin/$crossConfig-gcc $gccPath/$crossConfig-gcc
|
|
#ln -s gcc $out/bin/cc
|
|
|
|
mkGccWrapper $out/bin/$crossConfig-g++ $gccPath/$crossConfig-g++
|
|
ln -s $crossConfig-g++ $out/bin/$crossConfig-c++
|
|
|
|
mkGccWrapper $out/bin/$crossConfig-g77 $gccPath/$crossConfig-g77
|
|
ln -s $crossConfig-g77 $out/bin/$crossConfig-f77
|
|
|
|
ln -s $binutils/bin/$crossConfig-ar $out/bin/$crossConfig-ar
|
|
ln -s $binutils/bin/$crossConfig-as $out/bin/$crossConfig-as
|
|
ln -s $binutils/bin/$crossConfig-nm $out/bin/$crossConfig-nm
|
|
ln -s $binutils/bin/$crossConfig-strip $out/bin/$crossConfig-strip
|
|
|
|
|
|
# Make a wrapper around the linker.
|
|
doSubstitute "$ldWrapper" "$out/bin/$crossConfig-ld"
|
|
chmod +x "$out/bin/$crossConfig-ld"
|
|
|
|
|
|
# Emit a setup hook. Also store the path to the original GCC and
|
|
# Glibc.
|
|
test -n "$gcc" && echo $gcc > $out/nix-support/orig-gcc
|
|
test -n "$libc" && echo $libc > $out/nix-support/orig-libc
|
|
|
|
doSubstitute "$addFlags" "$out/nix-support/add-flags"
|
|
|
|
doSubstitute "$setupHook" "$out/nix-support/setup-hook"
|
|
|
|
cp -p $utils $out/nix-support/utils
|