chore(gt): update google webrtc

Author: vyloy

.github/workflows/container.yml

@@ -47,7 +47,7 @@ jobs:
     - name: Archive GT artifacts
       uses: actions/upload-artifact@v3
       with:
-        name: gt-liunx
+        name: gt-linux
         path: |
           release/*
 
@@ -288,7 +288,6 @@ jobs:
         chmod +x gn && mv gn /usr/local/opt/llvm@16/bin/
         sudo ln -s /usr/local/opt/llvm@16 /opt/homebrew/opt/llvm
         ln -s /usr/local/opt/llvm@16 /usr/local/opt/llvm
-        ln -s /usr/local/opt/llvm@16/bin/llvm-objcopy /usr/local/opt/llvm@16/bin/llvm-objcopy-mp-15
         echo 'export PATH="/usr/local/opt/llvm@16/bin:$PATH"' >> ~/.bash_profile
         export PATH="/usr/local/opt/make/libexec/gnubin:$PATH"
         echo 'export PATH="/usr/local/opt/binutils/bin:$PATH"' >> ~/.bash_profile
@@ -299,12 +298,12 @@ jobs:
         cargo build --target x86_64-apple-darwin -r
         cd ..
         mkdir -p release
-        cp target/x86_64-apple-darwin/release/gt release/gt-darwin-x86_64
+        cp target/x86_64-apple-darwin/release/gt release/gt-macos-x86_64
 
     - name: Archive GT artifacts
       uses: actions/upload-artifact@v3
       with:
-        name: gt-x8664-macos
+        name: gt-macos-x86_64
         path: |
           release/*
 
@@ -334,7 +333,6 @@ jobs:
         unzip gn-mac-amd64.zip
         chmod +x gn && mv gn /opt/homebrew/opt/llvm@16/bin/
         ln -s /opt/homebrew/opt/llvm@16 /opt/homebrew/opt/llvm
-        ln -s /opt/homebrew/opt/llvm@16/bin/llvm-objcopy /opt/homebrew/opt/llvm@16/bin/llvm-objcopy-mp-15
         echo 'export PATH="/opt/homebrew/opt/llvm/bin:$PATH"' >> ~/.bash_profile
         export PATH="/opt/homebrew/opt/make/libexec/gnubin:$PATH"
         echo 'export PATH="/opt/homebrew/opt/binutils/bin:$PATH"' >> ~/.bash_profile
@@ -345,11 +343,11 @@ jobs:
         cargo build --target aarch64-apple-darwin -r
         cd ..
         mkdir -p release
-        cp target/aarch64-apple-darwin/release/gt release/gt-darwin-aarch64
+        cp target/aarch64-apple-darwin/release/gt release/gt-macos-aarch64
 
     - name: Archive GT artifacts
       uses: actions/upload-artifact@v3
       with:
-        name: gt-arm64-macos
+        name: gt-macos-aarch64
         path: |
           release/*

Cargo.lock

@@ -35,5 +35,5 @@ darwin:
 	cd ./libcs &&  TARGET=aarch64-apple-darwin GOOS=darwin GOARCH=arm64 arch -arch arm64 make release_lib
 	cargo build --target aarch64-apple-darwin -r
 	mkdir -p release
-	cp target/x86_64-apple-darwin/release/gt release/gt-darwin-x86_64
-	cp target/aarch64-apple-darwin/release/gt release/gt-darwin-aarch64
+	cp target/x86_64-apple-darwin/release/gt release/gt-macos-x86_64
+	cp target/aarch64-apple-darwin/release/gt release/gt-macos-aarch64

Makefile

@@ -59,13 +59,16 @@ ifeq ($(TARGET_OS), apple)
 	export CC=clang
 	export CXX=clang++
 	TARGET_OS=mac
-	OBJCOPY=llvm-objcopy-mp-15
+	OBJCOPY=llvm-objcopy
+	_SETUP_LLVM:=$(shell rm dep/_google-webrtc/src/third_party/llvm-build/Release+Asserts 2> /dev/null)
 	ifeq ($(TARGET_CPU), arm64)
 		RUST_TARGET?=aarch64-apple-darwin
+		_SETUP_LLVM:=$(shell ln -s ./Release+Asserts.mac_arm64 dep/_google-webrtc/src/third_party/llvm-build/Release+Asserts)
 	else
 		ifndef RUST_TARGET
 			RUST_TARGET:=$(TARGET_CPU)-apple-darwin
 		endif
+		_SETUP_LLVM:=$(shell ln -s ./Release+Asserts.mac dep/_google-webrtc/src/third_party/llvm-build/Release+Asserts)
 	endif
 	DEF_WEBRTC_COND?=-DWEBRTC_MAC -DWEBRTC_POSIX
 	DEF_LDFLAGS?=-framework Cocoa
@@ -322,7 +325,6 @@ compile_webrtc: check_webrtc_dependencies update_submodule
 	cd ./dep/_google-webrtc/src && gn gen out/release-$(TARGET) --args=" \
         clang_use_chrome_plugins=false \
         use_xcode_clang=false \
-        clang_base_path=\"/opt/homebrew/opt/llvm\" \
         enable_google_benchmarks=false \
         enable_libaom=false \
         is_component_build=false \
@@ -349,15 +351,6 @@ compile_webrtc: check_webrtc_dependencies update_submodule
         use_lld=true \
         use_rtti=true \
         use_sysroot=false"
-	sed 's| [^ ]*gcc | $(CC) |g' ./dep/_google-webrtc/src/out/release-$(TARGET)/toolchain.ninja > ./dep/_google-webrtc/src/out/release-$(TARGET)/toolchain.ninja.tmp
-	cat ./dep/_google-webrtc/src/out/release-$(TARGET)/toolchain.ninja.tmp > ./dep/_google-webrtc/src/out/release-$(TARGET)/toolchain.ninja
-	rm ./dep/_google-webrtc/src/out/release-$(TARGET)/toolchain.ninja.tmp
-	sed 's| [^ ]*g++ | $(CXX) |g' ./dep/_google-webrtc/src/out/release-$(TARGET)/toolchain.ninja > ./dep/_google-webrtc/src/out/release-$(TARGET)/toolchain.ninja.tmp
-	cat ./dep/_google-webrtc/src/out/release-$(TARGET)/toolchain.ninja.tmp > ./dep/_google-webrtc/src/out/release-$(TARGET)/toolchain.ninja
-	rm ./dep/_google-webrtc/src/out/release-$(TARGET)/toolchain.ninja.tmp
-	sed 's|"ar"|$(TARGET)-ar|g' ./dep/_google-webrtc/src/out/release-$(TARGET)/toolchain.ninja > ./dep/_google-webrtc/src/out/release-$(TARGET)/toolchain.ninja.tmp
-	cat ./dep/_google-webrtc/src/out/release-$(TARGET)/toolchain.ninja.tmp > ./dep/_google-webrtc/src/out/release-$(TARGET)/toolchain.ninja
-	rm ./dep/_google-webrtc/src/out/release-$(TARGET)/toolchain.ninja.tmp
 	ninja -C ./dep/_google-webrtc/src/out/release-$(TARGET)
 endif