From 034567ec841b06733225eeb78fafcfd0ad359a0b Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Mon, 30 Oct 2017 17:40:35 +0000 Subject: bootstrap: Remove .la files from the stage3 sysroot This fixes cross-compilation of stage2-gcc against our stage3 base sysroot. If the `.la` files are not removed, Libtool insanity kicks in and we end up with the x86_64 version of libstdc++ included in the cross-build commandlines. --- elements/bootstrap/stage3-sysroot.bst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/elements/bootstrap/stage3-sysroot.bst b/elements/bootstrap/stage3-sysroot.bst index cc6d0632..8a4616ef 100644 --- a/elements/bootstrap/stage3-sysroot.bst +++ b/elements/bootstrap/stage3-sysroot.bst @@ -13,3 +13,12 @@ depends: config: exclude: [ debug, doc, locale ] + +public: + bst: + integration-commands: + # Remove libtool's `.la` files. These are not needed for the base + # platform to work, and actually break cross-compilation of stage2-gcc + # somehow -- /lib64/libstdc++.so gets in to the dependency list of + # cross-built C++ libraries, causing disaster. + - find ./usr/lib ./usr/lib64 ./usr/libexec -name lib\*.la -delete -- cgit v1.2.1