Skip to content

Commit

Permalink
fix build for mac (#150)
Browse files Browse the repository at this point in the history
* removal of old workflow

* Allow GHA on PR

* Allow GHA on PR

* Use compiler-rt and unwind for clang

* Update cmake

* Link unwind if found

* Run ldd on clang binaries

* Choose libgcc or libunwind based on libunwind presense

* Switch back checkout action to v2

* Link also to gcc_s if no libunwind

* Do not link LLVM libs

* Build for macOS

---------

Co-authored-by: theirix <theirix@gmail.com>
  • Loading branch information
kotbegemot and theirix authored Mar 27, 2024
1 parent 5cc00a4 commit c85ef1b
Show file tree
Hide file tree
Showing 36 changed files with 134 additions and 527 deletions.
38 changes: 38 additions & 0 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
on: [push, pull_request]

jobs:
build:
strategy:
matrix:
cxx_standard: [11, 14, 17]
build_type: ["Release", "Debug"]

runs-on: macos-latest

steps:
- uses: actions/checkout@v2
- name: Install system dependencies
run: |
brew install ninja cmake
python3 -m pip install --no-cache-dir conan==1.63
- name: Configure CMake
env:
BUILD_TYPE: ${{matrix.build_type}}
CXX_STANDARD: ${{matrix.cxx_standard}}
run: |
mkdir -p build
cmake -B build -GNinja \
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-DCMAKE_CXX_STANDARD=${{matrix.cxx_standard}} \
-DALLOW_EXAMPLES=ON \
-DALLOW_TESTS=ON \
-DENABLE_TESTS_MEASUREMENTS=ON \
-DALLOW_BENCHMARK=ON
- name: Build
run: cmake --build build

- name: Test
working-directory: build
run: ctest --rerun-failed --output-on-failure
60 changes: 0 additions & 60 deletions .github/workflows/ubuntu-gcc-4.9.yaml

This file was deleted.

9 changes: 6 additions & 3 deletions .github/workflows/ubuntu_clang.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#on: [push, pull_request]
on: [push]
on: [push, pull_request]

jobs:
build:
Expand Down Expand Up @@ -66,9 +65,9 @@ jobs:
| grep -Po "^Package: [a-zA-Z0-9-.\+ ]+$" \
| sed -e 's/Package:/ /g' \
| sed -e 's/[+\.a-zA-Z0-9-]*wasm[+\.a-zA-Z0-9-]*$/ /g' \
| sed -e 's/[+\.a-zA-Z0-9-]*-tools$/ /g' \
| sed -e 's/[+\.a-zA-Z0-9-]*polly[+\.a-zA-Z0-9-]*$/ /g' \
| sed -e 's/[+\.a-zA-Z0-9-]*python[+\.a-zA-Z0-9-]*$/ /g' \
| sed -e 's/.*-\(doc\|tools\|examples\|format\|tidy\|ocaml\|fuzzer\).*$/ /g' \
> pkglist
cat pkglist
Expand Down Expand Up @@ -100,3 +99,7 @@ jobs:
- name: Test
working-directory: build
run: ctest --rerun-failed --output-on-failure

- name: Analyze dependencies
working-directory: build
run: ldd bin/dataflow
115 changes: 0 additions & 115 deletions .github/workflows/ubuntu_clang_legacy.yaml

This file was deleted.

7 changes: 5 additions & 2 deletions .github/workflows/ubuntu_gcc.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#on: [push, pull_request]
on: [push]
on: [push, pull_request]

jobs:
build:
Expand Down Expand Up @@ -91,3 +90,7 @@ jobs:
- name: Test
working-directory: build
run: ctest --rerun-failed --output-on-failure

- name: Analyze dependencies
working-directory: build
run: ldd bin/dataflow
Loading

0 comments on commit c85ef1b

Please sign in to comment.