From 7b240e4d5ebd2f1454013048721efc2ee50ea1c0 Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Mon, 6 Jan 2020 14:24:57 +0100 Subject: [PATCH 1/3] Fix compiler extension example cmake integration - Do not add it to the Export file - Update install target --- llvm/examples/Bye/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/llvm/examples/Bye/CMakeLists.txt b/llvm/examples/Bye/CMakeLists.txt index ac3b33bf248b1..a6767209491af 100644 --- a/llvm/examples/Bye/CMakeLists.txt +++ b/llvm/examples/Bye/CMakeLists.txt @@ -2,7 +2,9 @@ add_llvm_pass_plugin(Bye Bye.cpp DEPENDS intrinsics_gen + BUILDTREE_ONLY ) + if (LLVM_LINK_LLVM_DYLIB) target_link_libraries(Bye PUBLIC LLVM) else() @@ -15,3 +17,7 @@ else() ) endif() +if( LLVM_BUILD_EXAMPLES ) + install(TARGETS ${name} RUNTIME DESTINATION examples) +endif() +set_target_properties(${name} PROPERTIES FOLDER "Examples") From 03309944ff938d155468197b5872bd8fe9dfd174 Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Wed, 13 Nov 2019 23:19:56 +0100 Subject: [PATCH 2/3] Setup default build action for llvm --- .github/workflows/llvm.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/llvm.yml diff --git a/.github/workflows/llvm.yml b/.github/workflows/llvm.yml new file mode 100644 index 0000000000000..c18b3c27d547c --- /dev/null +++ b/.github/workflows/llvm.yml @@ -0,0 +1,34 @@ +name: CI + +on: [push] + +jobs: + build_llvm: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: + - ubuntu-latest + - windows-latest + - macOS-latest + cmake_args: + - "" + steps: + - name: Setup Windows + if: startsWith(matrix.os, 'windows') + uses: tstellar/actions/setup-windows@master + with: + arch: amd64 + - uses: actions/checkout@v1 + with: + fetch-depth: 1 + - name: Install Ninja + uses: tstellar/actions/install-ninja@master + with: + os: ${{ runner.os }} + - name: Test LLVM + uses: tstellar/actions/build-test-llvm-project@master + with: + cmake_args: -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_args }} + os: ${{ runner.os }} From 61a3af9eb507384d74cdc091f785a40025155557 Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Thu, 21 Nov 2019 12:14:48 +0100 Subject: [PATCH 3/3] extra github validation --- .github/workflows/llvm.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/llvm.yml b/.github/workflows/llvm.yml index c18b3c27d547c..b98e5795c0562 100644 --- a/.github/workflows/llvm.yml +++ b/.github/workflows/llvm.yml @@ -9,11 +9,7 @@ jobs: fail-fast: false matrix: os: - - ubuntu-latest - - windows-latest - macOS-latest - cmake_args: - - "" steps: - name: Setup Windows if: startsWith(matrix.os, 'windows') @@ -27,8 +23,14 @@ jobs: uses: tstellar/actions/install-ninja@master with: os: ${{ runner.os }} - - name: Test LLVM + - name: Test LLVM / dynamic + if: startsWith(matrix.os, 'windows') == false uses: tstellar/actions/build-test-llvm-project@master with: - cmake_args: -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_args }} + cmake_args: -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_args }} -DLLVM_ENABLE_PROJECTS='clang;clang-tools-extra;compiler-rt;libcxx' -DLLVM_ENABLE_ASSERTIONS=ON '-DLLVM_BUILD_EXAMPLES=On' '-DCMAKE_MACOSX_RPATH=On' '-DLLVM_BUILD_EXTERNAL_COMPILER_RT=On' '-DLIBCXX_ENABLE_SHARED=OFF' '-DLIBCXX_ENABLE_STATIC=OFF' '-DLIBCXX_INCLUDE_TESTS=OFF' '-DLLVM_ENABLE_ASSERTIONS=On' + os: ${{ runner.os }} + - name: Test LLVM / static + uses: tstellar/actions/build-test-llvm-project@master + with: + cmake_args: -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_args }} -DLLVM_ENABLE_PROJECTS='clang;clang-tools-extra;compiler-rt;libcxx' -DLLVM_ENABLE_ASSERTIONS=ON '-DLLVM_BUILD_EXAMPLES=On' '-DCMAKE_MACOSX_RPATH=On' '-DLLVM_BUILD_EXTERNAL_COMPILER_RT=On' '-DLIBCXX_ENABLE_SHARED=OFF' '-DLIBCXX_ENABLE_STATIC=OFF' '-DLIBCXX_INCLUDE_TESTS=OFF' '-DLLVM_ENABLE_ASSERTIONS=On' os: ${{ runner.os }}