Skip to content

Commit 2bb70b5

Browse files
committed
fix abseil cpp build error.
1 parent 0c3c326 commit 2bb70b5

2 files changed

Lines changed: 17 additions & 0 deletions

File tree

webrtc-sys/libwebrtc/build_linux.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,10 @@ cd third_party
9999

100100
git apply "$COMMAND_DIR/patches/david_disable_gun_source_macro.patch" -v --ignore-space-change --ignore-whitespace --whitespace=nowarn
101101

102+
if [ "$arch" = "x64" ]; then
103+
git apply "$COMMAND_DIR/patches/fix_abseil_cpp_build_on_x64.patch" -v --ignore-space-change --ignore-whitespace --whitespace=nowarn
104+
fi
105+
102106
cd libyuv
103107

104108
git apply "$COMMAND_DIR/patches/disable_sme_for_libyuv.patch" -v --ignore-space-change --ignore-whitespace --whitespace=nowarn
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..57c1cec741 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 <x86gprintrin.h>
11+
#endif // __BMI2__
12+
13+
namespace absl {

0 commit comments

Comments
 (0)