buildtools のパスを見直し

shiguredo · Oct 19, 2023 · 94e0856 · 94e0856
1 parent 13e2495
commit 94e0856
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/run.py b/run.py
@@ -408,7 +408,7 @@ def build_install_webrtc(version, source_dir, build_dir, install_dir, platform,
 
     # インクルードディレクトリを増やしたくないので、
     # __config_site を libc++ のディレクトリにコピーしておく
-    libcxx_dir = os.path.join(source_dir, 'webrtc', 'src', 'buildtools', 'third_party', 'libc++')
+    libcxx_dir = os.path.join(source_dir, 'webrtc', 'src', 'third_party', 'libc++')
     if not os.path.exists(os.path.join(libcxx_dir, 'src', 'include', '__config_site')):
         shutil.copyfile(os.path.join(libcxx_dir, '__config_site'),
                         os.path.join(libcxx_dir, 'src', 'include', '__config_site'))
@@ -434,7 +434,7 @@ def get_webrtc_info(webrtcbuild: bool, source_dir: str, build_dir: str, install_
             webrtc_library_dir=os.path.join(webrtc_build_dir, 'obj')
             if platform.system() == 'Windows' else webrtc_build_dir, clang_dir=os.path.join(
                 webrtc_source_dir, 'src', 'third_party', 'llvm-build', 'Release+Asserts'),
-            libcxx_dir=os.path.join(webrtc_source_dir, 'src', 'buildtools', 'third_party', 'libc++', 'src'),)
+            libcxx_dir=os.path.join(webrtc_source_dir, 'src', 'third_party', 'libc++', 'src'),)
     else:
         return WebrtcInfo(
             version_file=os.path.join(webrtc_install_dir, 'VERSIONS'),
@@ -1138,8 +1138,8 @@ def install_deps(platform: Platform, source_dir, build_dir, install_dir, debug,
             # LLVM
             tools_url = webrtc_version['WEBRTC_SRC_TOOLS_URL']
             tools_commit = webrtc_version['WEBRTC_SRC_TOOLS_COMMIT']
-            libcxx_url = webrtc_version['WEBRTC_SRC_BUILDTOOLS_THIRD_PARTY_LIBCXX_SRC_URL']
-            libcxx_commit = webrtc_version['WEBRTC_SRC_BUILDTOOLS_THIRD_PARTY_LIBCXX_SRC_COMMIT']
+            libcxx_url = webrtc_version['WEBRTC_SRC_THIRD_PARTY_LIBCXX_SRC_URL']
+            libcxx_commit = webrtc_version['WEBRTC_SRC_THIRD_PARTY_LIBCXX_SRC_COMMIT']
             buildtools_url = webrtc_version['WEBRTC_SRC_BUILDTOOLS_URL']
             buildtools_commit = webrtc_version['WEBRTC_SRC_BUILDTOOLS_COMMIT']
             install_llvm_args = {

diff --git a/third_party/lyra/toolchain/android/BUILD.tpl b/third_party/lyra/toolchain/android/BUILD.tpl
@@ -21,7 +21,7 @@ cc_toolchain_config(
         '%{android_ndk}/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/%{clang_version}/include',
         '%sysroot%/usr/include',
         '%sysroot%/usr/local/include',
-        "%{webrtc_include_dir}/buildtools/third_party/libc++abi/src/include",
+        "%{webrtc_include_dir}/third_party/libc++abi/src/include",
         "%{llvm_dir}/libcxx/include",
     ],
     tool_paths = {
@@ -87,7 +87,7 @@ cc_toolchain_config(
     # conly_flags = [],
     cxx_flags = [
         "-isystem%{llvm_dir}/libcxx/include",
-        "-isystem%{webrtc_include_dir}/buildtools/third_party/libc++abi/src/include",
+        "-isystem%{webrtc_include_dir}/third_party/libc++abi/src/include",
         "-std=c++17",
         "-nostdinc++",
         "-D_LIBCPP_ABI_NAMESPACE=Cr",

diff --git a/third_party/lyra/toolchain/linux_x86_64/BUILD.tpl b/third_party/lyra/toolchain/linux_x86_64/BUILD.tpl
@@ -24,7 +24,7 @@ cc_toolchain_config(
         "/usr/include/x86_64-linux-gnu",
         "/usr/include",
         "%{llvm_dir}/libcxx/include",
-        "%{webrtc_include_dir}/buildtools/third_party/libc++abi/src/include",
+        "%{webrtc_include_dir}/third_party/libc++abi/src/include",
     ],
     tool_paths = {
         "ar": "%{llvm_dir}/clang/bin/llvm-ar",
@@ -84,7 +84,7 @@ cc_toolchain_config(
     # conly_flags = [],
     cxx_flags = [
         "-isystem%{llvm_dir}/libcxx/include",
-        "-isystem%{webrtc_include_dir}/buildtools/third_party/libc++abi/src/include",
+        "-isystem%{webrtc_include_dir}/third_party/libc++abi/src/include",
         "-std=c++17",
         "-nostdinc++",
         "-D_LIBCPP_ABI_NAMESPACE=Cr",
@@ -145,7 +145,7 @@ cc_toolchain_config(
         "/usr/include/aarch64-linux-gnu",
         "/usr/include",
         "%{llvm_dir}/libcxx/include",
-        "%{webrtc_include_dir}/buildtools/third_party/libc++abi/src/include",
+        "%{webrtc_include_dir}/third_party/libc++abi/src/include",
     ],
     tool_paths = {
         "ar": "%{llvm_dir}/clang/bin/llvm-ar",
@@ -207,7 +207,7 @@ cc_toolchain_config(
     # conly_flags = [],
     cxx_flags = [
         "-isystem%{llvm_dir}/libcxx/include",
-        "-isystem%{webrtc_include_dir}/buildtools/third_party/libc++abi/src/include",
+        "-isystem%{webrtc_include_dir}/third_party/libc++abi/src/include",
         "-std=c++17",
         "-nostdinc++",
         "-D_LIBCPP_ABI_NAMESPACE=Cr",