パッケージディレクトリ変更に追従する

shiguredo · Oct 31, 2023 · e5b484c · e5b484c
1 parent cad4580
commit e5b484c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/doc/BUILD_LINUX_LOCAL.md b/doc/BUILD_LINUX_LOCAL.md
@@ -299,7 +299,7 @@ if [ ! -e $INSTALL_DIR/boost/lib/libboost_filesystem.a ]; then
       cxxflags=" \
         -D_LIBCPP_ABI_UNSTABLE \
         -nostdinc++ \
-        -isystem$SOURCE_DIR/webrtc/src/buildtools/third_party/libc++/trunk/include \
+        -isystem$SOURCE_DIR/webrtc/src/buildtools/third_party/libc++/src/include \
       " \
       toolset=clang \
       visibility=global \
@@ -381,7 +381,7 @@ pushd ../_build/local_webrtc
     -DWEBRTC_LIBRARY_DIR=$INSTALL_DIR/webrtc/lib \
     -DCLANG_ROOT=$SOURCE_DIR/webrtc/src/third_party/llvm-build/Release+Asserts \
     -DUSE_LIBCXX=ON \
-    -DLIBCXX_INCLUDE_DIR=$SOURCE_DIR/webrtc/src/buildtools/third_party/libc++/trunk/include \
+    -DLIBCXX_INCLUDE_DIR=$SOURCE_DIR/webrtc/src/buildtools/third_party/libc++/src/include \
     ../..
 
   cmake --build . -j$JOBS

diff --git a/script/get_llvm.sh b/script/get_llvm.sh
@@ -38,11 +38,11 @@ popd
 # 特定バージョンの libcxx を利用する
 pushd $OUTPUT_DIR/llvm
   if [ ! -e libcxx/.git ]; then
-    git clone $WEBRTC_SRC_BUILDTOOLS_THIRD_PARTY_LIBCXX_TRUNK_URL
+    git clone $WEBRTC_SRC_THIRD_PARTY_LIBCXX_SRC_URL
   fi
   pushd libcxx
     git fetch
-    git reset --hard $WEBRTC_SRC_BUILDTOOLS_THIRD_PARTY_LIBCXX_TRUNK_COMMIT
+    git reset --hard $WEBRTC_SRC_THIRD_PARTY_LIBCXX_SRC_COMMIT
   popd
 popd