Disable attribute warning for crashpad_util

getsentry · Jan 16, 2025 · a706ad3 · a706ad3
1 parent 9c0c6c3
commit a706ad3
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,18 +24,24 @@ jobs:
             platform: ubuntu-20.04
             CC: gcc
             CXX: g++
-          - name: Ubuntu (clang 24.04)
+          - name: Ubuntu (clang 18.1.3)
             platform: ubuntu-24.04
             CC: clang
             CXX: clang++
-          - name: Ubuntu (clang 22.04)
+          - name: Ubuntu (clang 14.0.0)
             platform: ubuntu-22.04
             CC: clang
             CXX: clang++
-          - name: Ubuntu (clang 20.04)
-            platform: ubuntu-20.04
+          - name: Ubuntu (clang 18.1.3 + libc++)
+            platform: ubuntu-24.04
+            CC: clang
+            CXX: clang++
+            CMAKE_DEFINES: "-DCMAKE_CXX_FLAGS=\"-stdlib=libc++ -L/usr/lib/x86_64-linux-gnu\" -DCMAKE_EXE_LINKER_FLAGS=\"-L/usr/lib/x86_64-linux-gnu\""
+          - name: Ubuntu (clang 14.0.0 + libc++)
+            platform: ubuntu-22.04
             CC: clang
             CXX: clang++
+            CMAKE_DEFINES: "-DCMAKE_CXX_FLAGS=\"-stdlib=libc++ -L/usr/lib/x86_64-linux-gnu\" -DCMAKE_EXE_LINKER_FLAGS=\"-L/usr/lib/x86_64-linux-gnu\""
           - name: Windows (x64)
             platform: windows-latest
           - name: Windows (arm64)
@@ -77,20 +83,43 @@ jobs:
           MINGW_ASM_MASM_COMPILER: ${{ matrix.MINGW_ASM_MASM_COMPILER }}
         run: . "cmake\scripts\install-llvm-mingw.ps1"
 
-      - name: Build crashpad
+      - name: Build crashpad (Linux)
+        if: ${{ runner.os == 'Linux' }}
         shell: bash
         run: |
           [ "${{ matrix.CC }}" ] && export CC="${{ matrix.CC }}"
           [ "${{ matrix.CXX }}" ] && export CXX="${{ matrix.CXX }}"
           echo "CMAKE_DEFINES=${CMAKE_DEFINES}"
-          cmake -B cmake-build -D CRASHPAD_BUILD_TOOLS=On ${CMAKE_DEFINES}
+          clang++ -v -stdlib=libc++
+          clang++ --version
+          llvm-config --includedir
+          llvm-config --libdir
+          llvm-config --version
+          cmake -B cmake-build -D CRASHPAD_BUILD_TOOLS=On "${CMAKE_DEFINES}"
           cmake --build cmake-build --parallel
 
-      - name: Build crashpad with client-side stack traces
+      - name: Build crashpad with client-side stack traces (Linux)
+        if: ${{ runner.os == 'Linux' }}
         shell: bash
         run: |
           [ "${{ matrix.CC }}" ] && export CC="${{ matrix.CC }}"
           [ "${{ matrix.CXX }}" ] && export CXX="${{ matrix.CXX }}"
+          echo "CMAKE_DEFINES=${CMAKE_DEFINES}"
+          cmake -B cmake-build-stacks -D CRASHPAD_ENABLE_STACKTRACE=ON "${CMAKE_DEFINES}"
+          cmake --build cmake-build-stacks --parallel
+
+      - name: Build crashpad (Windows)
+        if: ${{ runner.os == 'Windows' }}
+        shell: bash
+        run: |
+          echo "CMAKE_DEFINES=${CMAKE_DEFINES}"
+          cmake -B cmake-build -D CRASHPAD_BUILD_TOOLS=On ${CMAKE_DEFINES}
+          cmake --build cmake-build --parallel
+
+      - name: Build crashpad with client-side stack traces (Windows)
+        if: ${{ runner.os == 'Windows' }}
+        shell: bash
+        run: |
           echo "CMAKE_DEFINES=${CMAKE_DEFINES}"
           cmake -B cmake-build-stacks -D CRASHPAD_ENABLE_STACKTRACE=ON ${CMAKE_DEFINES}
           cmake --build cmake-build-stacks --parallel

diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
@@ -550,6 +550,7 @@ endif()
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     target_compile_options(crashpad_util PRIVATE
         $<$<COMPILE_LANGUAGE:CXX>:-Wno-multichar>
+        $<$<COMPILE_LANGUAGE:CXX>:-Wno-attributes>
     )
 endif()