diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cc1beb58..18b1f838 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -163,7 +163,7 @@ jobs: if: matrix.name == 'ubuntu-20.04_x86_64' || matrix.name == 'ubuntu-22.04_x86_64' run: | source VERSION - # clang-17 と CUDA を入れる + # clang-18 と CUDA を入れる sudo apt-get update sudo apt-get install -y software-properties-common diff --git a/run.py b/run.py index 9bb50409..b171587e 100644 --- a/run.py +++ b/run.py @@ -1406,8 +1406,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-17") - cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-17") + cmake_args.append("-DCMAKE_C_COMPILER=clang-18") + cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-18") path = cmake_path(os.path.join(webrtc_info.libcxx_dir, 'include')) cmake_args.append(f"-DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES={path}") flags = [ @@ -1485,8 +1485,8 @@ def install_deps(platform: Platform, source_dir, build_dir, install_dir, debug, 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-17") - cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-17") + cmake_args.append("-DCMAKE_C_COMPILER=clang-18") + cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-18") else: cmake_args.append( f"-DCMAKE_C_COMPILER={cmake_path(os.path.join(webrtc_info.clang_dir, 'bin', 'clang'))}") @@ -1643,8 +1643,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-17") - cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-17") + cmake_args.append("-DCMAKE_C_COMPILER=clang-18") + cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-18") else: cmake_args.append( f"-DCMAKE_C_COMPILER={cmake_path(os.path.join(webrtc_info.clang_dir, 'bin', 'clang'))}") @@ -1805,8 +1805,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-17") - cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-17") + cmake_args.append("-DCMAKE_C_COMPILER=clang-18") + cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-18") else: cmake_args.append( f"-DCMAKE_C_COMPILER={cmake_path(os.path.join(webrtc_info.clang_dir, 'bin', 'clang'))}")