From 08b120b2e38e74182af7ad63e579a66fb931a5c0 Mon Sep 17 00:00:00 2001 From: torikizi Date: Sun, 22 Oct 2023 12:06:19 +0900 Subject: [PATCH] =?UTF-8?q?clang=2015=20=E3=82=92=E4=BD=BF=E3=81=86?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=A6=E3=81=BF=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- run.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/run.py b/run.py index f344afba..1b23e4cb 100644 --- a/run.py +++ b/run.py @@ -1353,8 +1353,8 @@ def install_deps(platform: Platform, source_dir, build_dir, install_dir, debug, install_vpl_args['cmake_args'].append(f"-DCMAKE_CXX_FLAGS={' '.join(cxxflags)}") if platform.target.os == 'ubuntu': cmake_args = [] - cmake_args.append("-DCMAKE_C_COMPILER=clang-12") - cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-12") + cmake_args.append("-DCMAKE_C_COMPILER=clang-15") + cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-15") path = cmake_path(os.path.join(webrtc_info.libcxx_dir, 'include')) cmake_args.append(f"-DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES={path}") flags = [ @@ -1503,8 +1503,8 @@ def main(): cmake_args.append(f'-DCMAKE_SYSTEM_VERSION={WINDOWS_SDK_VERSION}') if platform.target.os == 'ubuntu': if platform.target.package_name in ('ubuntu-20.04_x86_64', 'ubuntu-22.04_x86_64'): - cmake_args.append("-DCMAKE_C_COMPILER=clang-12") - cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-12") + cmake_args.append("-DCMAKE_C_COMPILER=clang-15") + cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-15") else: cmake_args.append( f"-DCMAKE_C_COMPILER={cmake_path(os.path.join(webrtc_info.clang_dir, 'bin', 'clang'))}") @@ -1663,8 +1663,8 @@ def main(): cmake_args.append(f'-DCMAKE_SYSROOT={sysroot}') if platform.target.os == 'ubuntu': if platform.target.package_name in ('ubuntu-20.04_x86_64', 'ubuntu-22.04_x86_64'): - cmake_args.append("-DCMAKE_C_COMPILER=clang-12") - cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-12") + cmake_args.append("-DCMAKE_C_COMPILER=clang-15") + cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-15") else: cmake_args.append( f"-DCMAKE_C_COMPILER={cmake_path(os.path.join(webrtc_info.clang_dir, 'bin', 'clang'))}")