diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 500cd78..9efd5f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: install system dependencies - run: sudo apt-get update && sudo apt-get install cmake libexpat1-dev libfontconfig-dev libfreetype-dev pkg-config + run: sudo apt-get update && sudo apt-get install lld cmake libexpat1-dev libfontconfig-dev libfreetype-dev pkg-config - uses: actions/checkout@v3 - name: install toolchain run: rustup show @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-latest steps: - name: install system dependencies - run: sudo apt-get update && sudo apt-get install cmake libexpat1-dev libfontconfig-dev libfreetype-dev pkg-config + run: sudo apt-get update && sudo apt-get install lld cmake libexpat1-dev libfontconfig-dev libfreetype-dev pkg-config - uses: actions/checkout@v3 - name: install toolchain run: rustup show diff --git a/README.md b/README.md index 5b1b860..560f803 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ To compile, a stable Rust compiler and [just](https://github.com/casey/just) are - cargo - just +- lld Some C libraries are also required for font support at the moment. diff --git a/debian/control b/debian/control index e45bee7..168b310 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ Build-Depends: libexpat1-dev, libfontconfig-dev, libfreetype-dev, + lld, pkg-config, Standards-Version: 4.6.2 Homepage: https://github.com/pop-os/cosmic-settings diff --git a/justfile b/justfile index 9def40e..ebbbd25 100644 --- a/justfile +++ b/justfile @@ -3,10 +3,12 @@ appid := 'com.system76.CosmicSettings' x86-64-target := 'x86-64-v2' +linker := '-C link-arg=-fuse-ld=lld' + export RUSTFLAGS := if arch() == 'x86_64' { - '-C target-cpu=' + x86-64-target + linker + ' -C target-cpu=' + x86-64-target } else { - '' + linker } rootdir := ''