diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-11-28 10:40:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-28 10:40:40 +0000 |
| commit | 38b475f7c99ae9d0fe621c838e4c032891f9f9a3 (patch) | |
| tree | e8b7f8f024060c0673a9c18c8250190bb86eb590 | |
| parent | 520e8327a687e4008c898651aebad021dc686f69 (diff) | |
| parent | fef6eb71605f8f35448b2e84526d707ee1b794fa (diff) | |
| download | patchelf-38b475f7c99ae9d0fe621c838e4c032891f9f9a3.tar.gz | |
Merge pull request #343 from NixOS/build-fix
add missing <optional> include
| -rw-r--r-- | .github/workflows/ci.yml | 15 | ||||
| -rw-r--r-- | src/patchelf.cc | 1 |
2 files changed, 15 insertions, 1 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b174c91..db236d4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,9 +3,22 @@ on: pull_request: push: jobs: - tests: + nix: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - uses: cachix/install-nix-action@v13 - run: nix-build -A hydraJobs.release + ubuntu: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: get toolchain version + run: | + c++ --version + ld --version + autoconf --version + - run: | + ./bootstrap.sh + ./configure --with-asan --with-ubsan + make -j$(nproc) check diff --git a/src/patchelf.cc b/src/patchelf.cc index 41fdde0..1aeae88 100644 --- a/src/patchelf.cc +++ b/src/patchelf.cc @@ -26,6 +26,7 @@ #include <string> #include <unordered_map> #include <vector> +#include <optional> #include <cassert> #include <cerrno> |