From 15e1895159627f168972f8ecb409ff60223fd468 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Tue, 14 May 2024 00:08:10 -0400 Subject: [PATCH] Try some more linker magic to get it working on ubuntu 20 (#11784) Release Notes: - N/A --- script/bundle-linux | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/bundle-linux b/script/bundle-linux index 2108b6a408..6c7c35bcd2 100755 --- a/script/bundle-linux +++ b/script/bundle-linux @@ -38,7 +38,7 @@ host_line=$(echo "$version_info" | grep host) target_triple=${host_line#*: } # Build binary in release mode -export RUSTFLAGS="-C link-args=-Wl,-rpath,\$ORIGIN/../lib" +export RUSTFLAGS="-C link-args=-Wl,--disable-new-dtags,-rpath,\$ORIGIN/../lib" cargo build --release --target "${target_triple}" --package zed --package cli # Strip the binary of all debug symbols @@ -65,7 +65,7 @@ cp "target/${target_triple}/release/cli" "${zed_dir}/bin/cli" find_libs() { ldd target/${target_triple}/release/Zed |\ cut -d' ' -f3 |\ - grep -v '\<\(libstdc++.so\|libc.so\|libgcc_s.so\|libm.so\)' + grep -v '\<\(libstdc++.so\|libc.so\|libgcc_s.so\|libm.so\|libpthread.so\)' } mkdir -p "${zed_dir}/lib"