Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
larseggert committed Feb 3, 2025
1 parent 1c39a02 commit 630040e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
10 changes: 8 additions & 2 deletions .github/actions/rust/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,15 @@ runs:
{
echo "CARGO_PROFILE_RELEASE_LTO=true"
echo "CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1"
case "${{ runner.os }}" in
Linux)
echo "RUSTFLAGS=-C linker=clang -C link-arg=-fuse-ld=mold $RUSTFLAGS"
;;
Windows)
echo "RUSTFLAGS=-C link-arg=-fuse-ld=lld $RUSTFLAGS"
;;
esac
} >> "$GITHUB_ENV"
[ "${{ runner.os }}" == "Linux" ] && echo "RUSTFLAGS=$RUSTFLAGS -C linker=clang -C link-arg=-fuse-ld=mold" >> "$GITHUB_ENV"
[ "${{ runner.os }}" == "Windows" ] && echo "RUSTFLAGS=$RUSTFLAGS -C link-arg=-fuse-ld=lld" >> "$GITHUB_ENV"
- name: Enable sscache
if: runner.environment != 'github-hosted'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
run: |
echo "/home/bench/.cargo/bin" >> "${GITHUB_PATH}"
# Append to RUSTFLAGS, which may already be set by the Rust action.
echo "RUSTFLAGS=$RUSTFLAGS -C link-arg=-Wl,--no-rosegment, -C force-frame-pointers=yes" >> "$GITHUB_ENV"
echo "RUSTFLAGS=-C link-arg=-Wl,--no-rosegment, -C force-frame-pointers=yes $RUSTFLAGS" >> "$GITHUB_ENV"
- name: Install Rust
uses: ./.github/actions/rust
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sanitize.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
RUST_BACKTRACE: 1
run: |
# Append to RUSTFLAGS, which may already be set by the Rust action.
export RUSTFLAGS="$RUSTFLAGS -Z sanitizer=${{ matrix.sanitizer }}"
export RUSTFLAGS="-Z sanitizer=${{ matrix.sanitizer }} $RUSTFLAGS"
if [ "${{ matrix.os }}" = "ubuntu-latest" ]; then
sudo apt-get install -y --no-install-recommends llvm
TARGET="x86_64-unknown-linux-gnu"
Expand Down

0 comments on commit 630040e

Please sign in to comment.