Skip to content

Commit 309c4b3

Browse files
committed
fix.
1 parent 504e46b commit 309c4b3

3 files changed

Lines changed: 18 additions & 169 deletions

File tree

webrtc-sys/libwebrtc/build_linux.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,10 @@ cd libyuv
103103

104104
git apply "$COMMAND_DIR/patches/disable_sme_for_libyuv.patch" -v --ignore-space-change --ignore-whitespace --whitespace=nowarn
105105

106+
cd ../abseil-cpp
107+
108+
git apply "$COMMAND_DIR/patches/abseil-cpp_include_fix.patch" -v --ignore-space-change --ignore-whitespace --whitespace=nowarn
109+
106110
cd ../../..
107111

108112
mkdir -p "$ARTIFACTS_DIR/lib"
@@ -114,8 +118,6 @@ if [ "$profile" = "debug" ]; then
114118
debug="true"
115119
fi
116120

117-
./upgrade_sysroot_libstdcxx.sh --arch "$arch"
118-
119121
# Note: use_clang_modules=false is required to avoid C++ module compilation issues.
120122
# Without this flag, the build may fail partway through, resulting in missing
121123
# or incomplete artifacts.
@@ -140,7 +142,7 @@ args="is_debug=$debug \
140142
use_llvm_libatomic=false \
141143
use_custom_libcxx=false \
142144
use_custom_libcxx_for_host=false \
143-
use_sysroot=true \
145+
use_sysroot=false \
144146
is_clang=false \
145147
use_clang_modules=false \
146148
rtc_include_tests=false \
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/abseil-cpp/absl/container/internal/raw_hash_set.h b/abseil-cpp/absl/container/internal/raw_hash_set.h
2+
index 191b1c9bb8..ebf884e908 100644
3+
--- a/abseil-cpp/absl/container/internal/raw_hash_set.h
4+
+++ b/abseil-cpp/absl/container/internal/raw_hash_set.h
5+
@@ -226,7 +226,7 @@
6+
#endif
7+
8+
#ifdef __BMI2__
9+
-#include <bmi2intrin.h>
10+
+#include <immintrin.h>
11+
#endif // __BMI2__
12+
13+
namespace absl {

webrtc-sys/libwebrtc/upgrade_sysroot_libstdcxx.sh

Lines changed: 0 additions & 166 deletions
This file was deleted.

0 commit comments

Comments
 (0)