try to build arm64 using clang

mpromonet · May 13, 2024 · 824f4ee · 824f4ee
1 parent 16078fc
commit 824f4ee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.github/workflows/cpp-cross-linux.yml b/.github/workflows/cpp-cross-linux.yml
@@ -1,4 +1,4 @@
-name: C/C++ CI linux cross compilation arm64
+name: C/C++ CI linux cross arm64
 
 on: [push]
 
@@ -36,7 +36,8 @@ jobs:
 
     - name: build
       run: |
-          cmake -DWEBRTCROOT=$(pwd)/webrtc -DCMAKE_BUILD_TYPE=${{ matrix.buildtype }} -DCMAKE_SYSTEM_PROCESSOR=arm64 -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY -DWEBRTCDESKTOPCAPTURE=OFF .
+          export PATH=$(pwd)/webrtc/src/third_party/llvm-build/Release+Asserts/bin:$PATH
+          cmake -DWEBRTCROOT=$(pwd)/webrtc -DCMAKE_BUILD_TYPE=${{ matrix.buildtype }} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY -DWEBRTCDESKTOPCAPTURE=OFF .
           make
 
     - name: cpack 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -251,9 +251,6 @@ target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE prometheus-cpp/core/inc
 
 # live555helper 
 include_directories(${WEBRTCROOT}/src/third_party/boringssl/src/include)
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
-    include_directories(${CMAKE_FIND_ROOT_PATH}/usr/include/aarch64-linux-gnu)
-endif()
 add_subdirectory(live555helper EXCLUDE_FROM_ALL)
 target_link_libraries (${CMAKE_PROJECT_NAME} liblive555helper ${WEBRTCOBJS}/third_party/boringssl/${CMAKE_STATIC_LIBRARY_PREFIX}boringssl${CMAKE_STATIC_LIBRARY_SUFFIX}) 
 add_definitions(-DHAVE_LIVE555)