Revert to GCC.

introlab · Jul 9, 2024 · 916be2c · 916be2c
1 parent 405ee8b
commit 916be2c
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 18 deletions.
diff --git a/.github/workflows/build_and_release.yml b/.github/workflows/build_and_release.yml
@@ -192,6 +192,7 @@ jobs:
         working-directory: build
         run: |
           cmake ../ -DCMAKE_BUILD_TYPE=${{ matrix.build-type}} -DCMAKE_BUILD_ARCHITECTURE=${{ matrix.architecture }}
+          export PATH=$PWD/../3rdParty/depot_tools:$PATH
           make -j3
           make install
 

diff --git a/3rdParty/webrtc_native/generate_ninja_files.bash b/3rdParty/webrtc_native/generate_ninja_files.bash
@@ -13,27 +13,27 @@ case "$architecture" in
 	i?86)
 		a=x86
 		extras=""
-		extra_flags="is_clang=true target_os=\"linux\""
+		extra_flags="is_clang=false target_os=\"linux\""
 	;;
 	x86_64|amd64)
 		a=x64
 		extras=""
-		extra_flags="is_clang=true target_os=\"linux\""
+		extra_flags="is_clang=false target_os=\"linux\""
 	;;
 	win64)
 		a=x64
 		extras=""
-		extra_flags="is_clang=true target_os=\"windows\""
+		extra_flags="is_clang=false target_os=\"windows\""
 	;;
 	arm32|armhf|armv*)
 		a=arm
 		extras=" arm_float_abi=\"hard\""
-		extra_flags="is_clang=true use_sysroot=true sysroot=\"$sysroot\" target_os=\"linux\" arm_control_flow_integrity=\"none\""
+		extra_flags="is_clang=false use_sysroot=true sysroot=\"$sysroot\" target_os=\"linux\" arm_control_flow_integrity=\"none\""
 	;;
 	arm64|aarch64)
 		a=arm64
 		extras=""
-		extra_flags="is_clang=true use_sysroot=true sysroot=\"$sysroot\" target_os=\"linux\" arm_control_flow_integrity=\"none\""
+		extra_flags="is_clang=false use_sysroot=true sysroot=\"$sysroot\" target_os=\"linux\" arm_control_flow_integrity=\"none\""
 	;;
 	osx64)
 		a=x64

diff --git a/docker/ubuntu-20.04/Dockerfile b/docker/ubuntu-20.04/Dockerfile
@@ -35,7 +35,6 @@ RUN mkdir build
 
 WORKDIR /root/webrtc-native-build/build
 RUN cmake ../ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_BUILD_ARCHITECTURE=${BUILD_ARCHITECTURE}
-RUN patch -u ../3rdParty/webrtc_native/webrtc/src/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc ../patches/loss_based_bwe_v2.cc.patch
 RUN export PATH=/root/webrtc-native-build/3rdParty/depot_tools:$PATH && make -j2
 RUN make install
 

diff --git a/docker/ubuntu-22.04/Dockerfile b/docker/ubuntu-22.04/Dockerfile
@@ -28,7 +28,6 @@ RUN mkdir build
 WORKDIR /root/webrtc-native-build/build
 
 RUN cmake ../ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_BUILD_ARCHITECTURE=${BUILD_ARCHITECTURE}
-RUN patch -u ../3rdParty/webrtc_native/webrtc/src/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc ../patches/loss_based_bwe_v2.cc.patch
 RUN export PATH=/root/webrtc-native-build/3rdParty/depot_tools:$PATH && make -j2
 RUN make install
 

diff --git a/docker/ubuntu-24.04/Dockerfile b/docker/ubuntu-24.04/Dockerfile
@@ -8,7 +8,15 @@ RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -y \
     ninja-build  libssl-dev libboost-all-dev libglib2.0-dev libgtk-3-dev libpulse-dev libasound2-dev patch
 
 # Install cross-compiler
-RUN apt install -y g++-aarch64-linux-gnu gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf clang
+RUN apt install -y g++-14-aarch64-linux-gnu gcc-14-aarch64-linux-gnu gcc-14-arm-linux-gnueabihf g++-14-arm-linux-gnueabihf clang
+RUN update-alternatives --install /usr/bin/aarch64-linux-gnu-gcc aarch64-linux-gnu-gcc /usr/bin/aarch64-linux-gnu-gcc-14 100
+RUN update-alternatives --install /usr/bin/aarch64-linux-gnu-g++ aarch64-linux-gnu-g++ /usr/bin/aarch64-linux-gnu-g++-14 100
+RUN update-alternatives --set aarch64-linux-gnu-gcc /usr/bin/aarch64-linux-gnu-gcc-14
+RUN update-alternatives --set aarch64-linux-gnu-g++ /usr/bin/aarch64-linux-gnu-g++-14
+RUN update-alternatives --install /usr/bin/arm-linux-gnueabihf-gcc arm-linux-gnueabihf-gcc /usr/bin/arm-linux-gnueabihf-gcc-14 100
+RUN update-alternatives --install /usr/bin/arm-linux-gnueabihf-g++ arm-linux-gnueabihf-g++ /usr/bin/arm-linux-gnueabihf-g++-14 100
+RUN update-alternatives --set arm-linux-gnueabihf-gcc /usr/bin/arm-linux-gnueabihf-gcc-14
+RUN update-alternatives --set arm-linux-gnueabihf-g++ /usr/bin/arm-linux-gnueabihf-g++-14
 
 # Define a build-time argument
 ARG BUILD_TYPE=Release
@@ -28,7 +36,6 @@ RUN mkdir build
 WORKDIR /root/webrtc-native-build/build
 
 RUN cmake ../ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_BUILD_ARCHITECTURE=${BUILD_ARCHITECTURE}
-RUN patch -u ../3rdParty/webrtc_native/webrtc/src/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc ../patches/loss_based_bwe_v2.cc.patch
 RUN export PATH=/root/webrtc-native-build/3rdParty/depot_tools:$PATH && make -j2
 RUN make install
 

diff --git a/patches/loss_based_bwe_v2.cc.patch b/patches/loss_based_bwe_v2.cc.patch