diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-23 17:06:57 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-23 17:06:57 +0000 |
| commit | c6b526495bc37e63b43c3fc17705cefac81fa904 (patch) | |
| tree | bfec07d0e3795c4e9df87db9663272b8abd9d981 /pkgs/build-support/gcc-cross-wrapper | |
| parent | 75b60caea072f258a3f014a1ea4fc8308692baca (diff) | |
Improving the crossStripping. A cross-glibc gets broken if stripped by the
native strip. So we now distinguish dontStrip and dontCrossStrip. I updated the expressions for glibc-2.9 and glibc-2.11 accordingly. I could get rid of the cross-glibc depending on the cross-gcc-stage-static. Enabling nls in the final cross-gcc. I still have problems on wint_t/wchar_t not working on cross build. Gettext does not build. svn path=/nixpkgs/branches/stdenv-updates/; revision=18562
Diffstat (limited to 'pkgs/build-support/gcc-cross-wrapper')
| -rw-r--r-- | pkgs/build-support/gcc-cross-wrapper/setup-hook.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh index e0b520edb4a24..0c98062a2db19 100644 --- a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh +++ b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh @@ -27,14 +27,17 @@ crossStripDirs() { if test -n "${dirs}"; then header "stripping (with flags $stripFlags) in $dirs" + # libc_nonshared.a should never be stripped, or builds will break. find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} $crossConfig-strip $stripFlags || true stopNest fi } crossStrip () { + # In cross_renaming we may rename dontCrossStrip to dontStrip, and + # dontStrip to dontNativeStrip. # TODO: strip _only_ ELF executables, and return || fail here... - if test -z "$dontStrip"; then + if test -z "$dontCrossStrip"; then stripDebugList=${stripDebugList:-lib lib64 libexec bin sbin} if test -n "$stripDebugList"; then crossStripDirs "$stripDebugList" "${stripDebugFlags:--S}" |