Skip to content

Commit

Permalink
fix docker test
Browse files Browse the repository at this point in the history
  • Loading branch information
miniben-90 committed Aug 6, 2024
1 parent 5056852 commit 696bd89
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[target.x86_64-unknown-linux-musl]
rustflags = [ "-C", "target-feature=-crt-static"]
rustflags = ["-C", "target-feature=-crt-static", "-lm"]

[target.aarch64-unknown-linux-musl]
linker = "aarch64-linux-musl-gcc"
rustflags = ["-C", "target-feature=-crt-static"]
rustflags = ["-C", "target-feature=-crt-static", "-lm"]
1 change: 1 addition & 0 deletions .github/docker-ubuntu-rust-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ sudo apt update
sudo apt upgrade -y

sudo apt install musl-tools -y
sudo apt install libxcb1-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxcb-shm0-dev pkg-config build-essential

rustup target add $target

Expand Down
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,11 @@ Dependencies are required to be installed for development purposes.
sudo apt install libxcb1-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxcb-shm0-dev pkg-config build-essential
```

> ⚠️**Warning**
> libc.so.6 is needed
> ⚠️**Warning**
> ⚠️**Warning**<br />
> libc.so.6 is needed<br />
> ⚠️**Warning**<br />
> Recovery url is not available on linux

### GNOME (Wayland)

In order to recover data, you'll need to install and activate an extension designed for systems running GNOME version 41 or newer (as evaluation is disabled from this version onward).
Expand Down
4 changes: 2 additions & 2 deletions x-win-rs/.cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[target.x86_64-unknown-linux-musl]
rustflags = [ "-C", "target-feature=-crt-static"]
rustflags = ["-C", "target-feature=-crt-static", "-lm"]

[target.aarch64-unknown-linux-musl]
linker = "aarch64-linux-musl-gcc"
rustflags = ["-C", "target-feature=-crt-static"]
rustflags = ["-C", "target-feature=-crt-static", "-lm"]

0 comments on commit 696bd89

Please sign in to comment.