Skip to content

Commit 7454992

Browse files
committed
revert changes.
1 parent 60a261d commit 7454992

1 file changed

Lines changed: 1 addition & 8 deletions

File tree

webrtc-sys/libwebrtc/build_linux.sh

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,6 @@ git apply "$COMMAND_DIR/patches/fix_pipewire_utils_compile.patch" -v --ignore-sp
8686
# See: https://github.com/zed-industries/zed/pull/51433#discussion_r2944567608
8787
git -C build apply "$COMMAND_DIR/patches/disable_crel.patch" -v --ignore-space-change --ignore-whitespace --whitespace=nowarn
8888

89-
# is_clang=false selects the //build/toolchain/linux GCC toolchains, which pass a bare
90-
# "ar" to be resolved from PATH. gcc_toolchain.gni rebases that against root_out_dir and
91-
# declares the result as an input, so ninja refuses to run any alink edge.
92-
git -C build apply "$COMMAND_DIR/patches/fix_gcc_toolchain_ar_input.patch" -v --ignore-space-change --ignore-whitespace --whitespace=nowarn
93-
9489
# GCC reports -Wchanges-meaning as an error rather than a warning, so
9590
# treat_warnings_as_errors=false does not cover it and WebRTC does not build without this.
9691
git -C build apply "$COMMAND_DIR/patches/disable_gcc_changes_meaning.patch" -v --ignore-space-change --ignore-whitespace --whitespace=nowarn
@@ -127,7 +122,6 @@ fi
127122
#
128123
# use_custom_libcxx=false keeps every std type in libwebrtc.a mangled the way
129124
# libstdc++ mangles it, instead of Chromium's std::__Cr:: ABI namespace.
130-
# is_clang=false builds with the host GCC, so the compiler matches too.
131125
args="is_debug=$debug \
132126
target_os=\"linux\" \
133127
target_cpu=\"$arch\" \
@@ -136,7 +130,6 @@ args="is_debug=$debug \
136130
use_llvm_libatomic=false \
137131
use_custom_libcxx=false \
138132
use_custom_libcxx_for_host=false \
139-
is_clang=false \
140133
use_clang_modules=false \
141134
rtc_include_tests=false \
142135
rtc_build_tools=false \
@@ -163,7 +156,7 @@ ninja -C "$OUTPUT_DIR" :default
163156
# make libwebrtc.a
164157
# don't include nasm
165158
ar -rc "$ARTIFACTS_DIR/lib/libwebrtc.a" `find "$OUTPUT_DIR/obj" -name '*.o' -not -path "*/third_party/nasm/*"`
166-
objcopy --redefine-syms="$COMMAND_DIR/boringssl_prefix_symbols.txt" "$ARTIFACTS_DIR/lib/libwebrtc.a"
159+
src/third_party/llvm-build/Release+Asserts/bin/llvm-objcopy --redefine-syms="$COMMAND_DIR/boringssl_prefix_symbols.txt" "$ARTIFACTS_DIR/lib/libwebrtc.a"
167160

168161
# License generation is optional - may fail with some Python versions
169162
# Use vpython3 from depot_tools for consistent Python version

0 commit comments

Comments
 (0)