From 70b8ce85a5caf42367bf012cacaa8645f84dbf9f Mon Sep 17 00:00:00 2001 From: Bart van Strien Date: Wed, 6 Sep 2017 17:57:28 +0200 Subject: [PATCH] Search for libstdc++ on host, rather than hardcoding its location --- tarball/build.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tarball/build.sh b/tarball/build.sh index 03588c4..1cfa46c 100755 --- a/tarball/build.sh +++ b/tarball/build.sh @@ -49,12 +49,13 @@ main() copy "$appbin" for dep in $(getdeps "$appbin"); do copy "$dep" - done - # Copy libstdc++ into its own location - echo "Copying libstdc++" - mkdir -p "$DEST/libstdc++/" - cp "/usr/lib/x86_64-linux-gnu/libstdc++.so.6" "$DEST/libstdc++/" # TODO: find libstdc++ on host + # Copy libstdc++ into its own location + if grep -qF 'libstdc++.so.6' <<< "$dep"; then + mkdir -p "$DEST/libstdc++/" + cp "$dep" "$DEST/libstdc++/" + fi + done # Build LD_LIBRARY_PATH string local libpath=""