From 0126fa578c466d1ded28d7e7c04e3743431d4571 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Thu, 31 Aug 2017 17:13:41 +0000
Subject: gnu-toolchain: Fix debug stripping for cross-builds of stage2

The stage2 elements were all using the default strip-commands which
don't take into account the fact that we might be cross-compiling.
An `objcopy` build for one architecture will ignore binaries for
other architectures that it doesn't understand, so in practice no
stripping was taking place for the stage2 components when we were
doing cross-builds.

With this change, a stage2 sysroot containing just the 'runtime' and
'devel' domains has gone from 889MB to 306MB.
---
 elements/gnu-toolchain/stage2-binutils.bst  | 4 ++++
 elements/gnu-toolchain/stage2-gawk.bst      | 4 ++++
 elements/gnu-toolchain/stage2-gcc.bst       | 4 ++++
 elements/gnu-toolchain/stage2-glibc.bst     | 4 ++++
 elements/gnu-toolchain/stage2-libstdcxx.bst | 4 ++++
 elements/gnu-toolchain/stage2-make.bst      | 4 ++++
 6 files changed, 24 insertions(+)

(limited to 'elements')

diff --git a/elements/gnu-toolchain/stage2-binutils.bst b/elements/gnu-toolchain/stage2-binutils.bst
index e3ef2eaa..612b31b6 100644
--- a/elements/gnu-toolchain/stage2-binutils.bst
+++ b/elements/gnu-toolchain/stage2-binutils.bst
@@ -38,3 +38,7 @@ config:
   - |
     export STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))"
     make
+
+  strip-commands:
+  - |
+    %{stage2-strip-binaries}
diff --git a/elements/gnu-toolchain/stage2-gawk.bst b/elements/gnu-toolchain/stage2-gawk.bst
index 1c15d53a..aa80f829 100644
--- a/elements/gnu-toolchain/stage2-gawk.bst
+++ b/elements/gnu-toolchain/stage2-gawk.bst
@@ -28,3 +28,7 @@ config:
     --build=$(sh config.guess)  --host=%{target-stage1}
   build-commands:
   - STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))" make
+
+  strip-commands:
+  - |
+    %{stage2-strip-binaries}
diff --git a/elements/gnu-toolchain/stage2-gcc.bst b/elements/gnu-toolchain/stage2-gcc.bst
index beaff58f..dffa4439 100644
--- a/elements/gnu-toolchain/stage2-gcc.bst
+++ b/elements/gnu-toolchain/stage2-gcc.bst
@@ -100,3 +100,7 @@ config:
     install -d "%{install-root}/lib"
     ln -s "%{prefix}/$libdir/libgcc_s.so" "%{install-root}/lib/"
     ln -s "%{prefix}/$libdir/libgcc_s.so.1" "%{install-root}/lib/"
+
+  strip-commands:
+  - |
+    %{stage2-strip-binaries}
diff --git a/elements/gnu-toolchain/stage2-glibc.bst b/elements/gnu-toolchain/stage2-glibc.bst
index 8c75e788..fd2c9b88 100644
--- a/elements/gnu-toolchain/stage2-glibc.bst
+++ b/elements/gnu-toolchain/stage2-glibc.bst
@@ -129,3 +129,7 @@ config:
       [ -z $loader ] && ( echo "Bug in stage2-glibc ld.so symlinks" ; exit 1 )
       ln -s "%{prefix}/lib/$loader" "%{install-root}/lib/$loader"
     esac
+
+  strip-commands:
+  - |
+    %{stage2-strip-binaries}
diff --git a/elements/gnu-toolchain/stage2-libstdcxx.bst b/elements/gnu-toolchain/stage2-libstdcxx.bst
index 12ea73fa..58055e8b 100644
--- a/elements/gnu-toolchain/stage2-libstdcxx.bst
+++ b/elements/gnu-toolchain/stage2-libstdcxx.bst
@@ -53,3 +53,7 @@ config:
 
   install-commands:
   - cd o && make DESTDIR="%{install-root}" install
+
+  strip-commands:
+  - |
+    %{stage2-strip-binaries}
diff --git a/elements/gnu-toolchain/stage2-make.bst b/elements/gnu-toolchain/stage2-make.bst
index 9c804f1b..0cb4cdb4 100644
--- a/elements/gnu-toolchain/stage2-make.bst
+++ b/elements/gnu-toolchain/stage2-make.bst
@@ -27,3 +27,7 @@ config:
     --build=$(sh config/config.guess) --host=%{target-stage1}
   build-commands:
   - STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))" make
+
+  strip-commands:
+  - |
+    %{stage2-strip-binaries}
-- 
cgit v1.2.1