try to disable lld

mpromonet · May 26, 2024 · c5340bf · c5340bf
1 parent 74e2b71
commit c5340bf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/cpp-macos.yml b/.github/workflows/cpp-macos.yml
@@ -36,7 +36,7 @@ jobs:
           cmake -DWEBRTCROOT=$(pwd)/webrtc -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=${{ matrix.buildtype }} -DDETECT_OPENSSL=OFF .
           file $(pwd)/webrtc/src/out/${{ matrix.buildtype }}/obj/api/video_codecs/libbuiltin_video_encoder_factory.a
           file $(pwd)/webrtc/src/out/${{ matrix.buildtype }}/obj/libwebrtc.a
-          ar tv $(pwd)/webrtc/src/out/${{ matrix.buildtype }}/obj/api/video_codecs/libbuiltin_video_encoder_factory.a
+          ar -t $(pwd)/webrtc/src/out/${{ matrix.buildtype }}/obj/api/video_codecs/libbuiltin_video_encoder_factory.a
           ar tv $(pwd)/webrtc/src/out/${{ matrix.buildtype }}/obj/libwebrtc.a
           make VERBOSE=1
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -53,7 +53,7 @@ MESSAGE("PulseAudio_FOUND = ${PulseAudio_FOUND}")
 set (WEBRTCOBJS ${WEBRTCROOT}/src/out/${CMAKE_BUILD_TYPE}/obj)
 
 if (NOT EXISTS ${WEBRTCOBJS}/${CMAKE_STATIC_LIBRARY_PREFIX}webrtc${CMAKE_STATIC_LIBRARY_SUFFIX})
-  set (WEBRTCARGS rtc_include_tests=false\nrtc_enable_protobuf=false\nrtc_build_examples=false\nrtc_build_tools=false\ntreat_warnings_as_errors=false\nrtc_enable_libevent=false\nrtc_build_libevent=false\nuse_glib=false\n)
+  set (WEBRTCARGS rtc_include_tests=false\nrtc_enable_protobuf=false\nrtc_build_examples=false\nrtc_build_tools=false\ntreat_warnings_as_errors=false\nrtc_enable_libevent=false\nrtc_build_libevent=false\nuse_glib=false\nuse_lld=false\n)
   set (WEBRTCARGS use_custom_libcxx=false\n${WEBRTCARGS})
   # debug/release
   if(CMAKE_BUILD_TYPE STREQUAL "Release")