History

remote_server: Remove dependency on libssl and libcrypto (#15446)

Fixes: #15599 Release Notes: - N/A ---------

Piotr Osiewicz committed 2 years ago

Commit 2c8a6ee1 parent 9016de541 files · +670 −226Browse files

Showing the changes to script/bundle-linux (1 of 41 files). Show all

Unified · Split

script/bundle-linux+8−1
@@ -43,7 +43,10 @@ script/generate-licenses · 42 unmodified lines
4343
4444 # Build binary in release mode
4545 export RUSTFLAGS="${RUSTFLAGS:-} -C link-args=-Wl,--disable-new-dtags,-rpath,\$ORIGIN/../lib"
46−cargo build --release --target "${target_triple}" --package zed --package cli --package remote_server
46+cargo build --release --target "${target_triple}" --package zed --package cli
47+# Build remote_server in separate invocation to prevent feature unification from other crates
48+# from influencing dynamic libraries required by it.
49+cargo build --release --target "${target_triple}" --package remote_server
4750
4851 # Strip the binary of all debug symbols
4952 # Later, we probably want to do something like this: https://github.com/GabrielMajeri/separate-symbols
@@ -51,6 +54,10 @@ strip --strip-debug "${target_dir}/${target_triple}/release/zed" · 1 unmodified line
5154 strip --strip-debug "${target_dir}/${target_triple}/release/cli"
5255 strip --strip-debug "${target_dir}/${target_triple}/release/remote_server"
5356
57+
58+# Ensure that remote_server does not depend on libssl nor libcrypto, as we got rid of these deps.
59+ldd "${target_dir}/${target_triple}/release/remote_server" | grep -q 'libcrypto\|libssl'
60+
5461 suffix=""
5562 if [ "$channel" != "stable" ]; then
5663 suffix="-$channel"

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t