diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5addf4b80..29ee8ac0f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -133,8 +133,6 @@ jobs: freebsd-amd64: name: FreeBSD AMD64 runs-on: ubuntu-latest - env: - LIBRARY_PATH: /usr/local/lib steps: - uses: actions/checkout@v4 - uses: actions/cache@v4 @@ -150,6 +148,6 @@ jobs: operating_system: freebsd version: '14.0' memory: 8G - environment_variables: 'CARGO_HOME RUSTUP_HOME LIBRARY_PATH CARGO_REGISTRIES_CRATES_IO_PROTOCOL' + environment_variables: 'CARGO_HOME RUSTUP_HOME CARGO_REGISTRIES_CRATES_IO_PROTOCOL' image_url: 'https://github.com/inko-lang/freebsd-builder/releases/download/v0.8.0/freebsd-14.0-x86-64.qcow2' run: ./ci/freebsd.sh diff --git a/Cargo.lock b/Cargo.lock index f6fe87dbd..f8f60e251 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -344,9 +344,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "llvm-sys" -version = "170.1.0" +version = "170.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb8b6d5671d471fec5010c24daa7c031e172bfaab1c48497ef6185c75eed88a5" +checksum = "cd263594e016a778a9cf53228b3c56fb9eb094c7bced467bd8a30802c4b40f95" dependencies = [ "anyhow", "cc", diff --git a/ci/mac.sh b/ci/mac.sh index 4dccf6aef..f787f11b1 100755 --- a/ci/mac.sh +++ b/ci/mac.sh @@ -15,8 +15,5 @@ rustup-init --quiet -y --no-modify-path --profile minimal \ echo "::endgroup::" echo "::group::Updating PATH" -echo "$(brew --prefix llvm@${LLVM_VERSION})/bin" >> $GITHUB_PATH -echo "LIBRARY_PATH=$(brew --prefix llvm@${LLVM_VERSION})/lib:$(brew --prefix zstd)/lib" \ - >> $GITHUB_ENV echo "${CARGO_HOME}/bin" >> $GITHUB_PATH echo "::endgroup::" diff --git a/docs/source/setup/installation.md b/docs/source/setup/installation.md index 4246cb73f..14d5840dc 100644 --- a/docs/source/setup/installation.md +++ b/docs/source/setup/installation.md @@ -273,41 +273,12 @@ Older versions of Fedora aren't supported. sudo pkg install llvm17 rust git ``` -You may have to set the `LIBRARY_PATH` variable as follows: - -```bash -export LIBRARY_PATH="/usr/local/lib" -``` - -Without this the linker may fail to find the zstd and libffi libraries, which -are needed by LLVM on FreeBSD. - ### macOS ```bash brew install llvm@17 rust git ``` -You may have to set `LIBRARY_PATH` as follows: - -```bash -export LIBRARY_PATH="$(brew --prefix llvm@17)/lib:$(brew --prefix zstd)/lib" -``` - -You may also have to add the LLVM `bin` directory to your `PATH` as follows: - -```bash -export PATH="$(brew --prefix llvm@17)/bin:$PATH" -``` - -Without setting these variables, it's possible building of Inko fails due to the -build process not finding the necessary LLVM libraries. - -::: tip -See [this Homebrew issue](https://github.com/Homebrew/brew/issues/13481) for -details on why this might be necessary. -::: - ### Ubuntu For Ubuntu 24.04 and newer: