summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2017-10-30 17:40:35 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2017-10-30 17:43:26 (GMT)
commit034567ec841b06733225eeb78fafcfd0ad359a0b (patch)
tree18c7056940be9565009dacac23248adeae0f5443
parent69c642d575d015ddf86f28a4e0f647a8108269f5 (diff)
downloaddefinitions-034567ec841b06733225eeb78fafcfd0ad359a0b.tar.gz
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.
-rw-r--r--elements/bootstrap/stage3-sysroot.bst9
1 files changed, 9 insertions, 0 deletions
diff --git a/elements/bootstrap/stage3-sysroot.bst b/elements/bootstrap/stage3-sysroot.bst
index cc6d063..8a4616e 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