corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Bug 1963424 - Statically link libxml2 to clang on Linux too. r=firefox-build-system-reviewers,sergesanspaille" for breaking Gecko decision task

Browse Source 
This reverts commit 48b965f25a.
This commit is contained in:
Cristina Horotan
2025-05-07 02:25:57 +03:00
committed by chorotan@mozilla.com
parent 1c85ce01d2
commit abe821d1b3
6 changed files with 38 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build/build-clang/build-clang.py
View File

@@ -288,13 +288,6 @@ def build_one_stage(
# checks.
cmake_args += ["-DCAN_TARGET_i386=1"]
cmake_args += ["-DLLVM_ENABLE_TERMINFO=OFF"]
libxml2 = os.path.join(os.environ.get("MOZ_FETCHES_DIR", ""), "libxml2")
if os.path.exists(libxml2):
cmake_args += [
"-DLIBXML2_DEFINITIONS=-DLIBXML_STATIC",
f"-DLIBXML2_INCLUDE_DIR={libxml2}/include/libxml2",
f"-DLIBXML2_LIBRARIES={libxml2}/lib/libxml2.a",
]
if is_windows(target):
cmake_args.insert(-1, "-DLLVM_EXPORT_SYMBOLS_FOR_PLUGINS=ON")
cmake_args.insert(-1, "-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded")

6
taskcluster/kinds/toolchain/clang.yml
View File

@@ -235,7 +235,6 @@ linux64-clang-19-raw:
toolchain:
- linux64-clang-19-stage1
- linux64-clang-19-profile
- linux64-libxml2
- linux64-toolchain-sysroot
linux64-clang-19:
@@ -299,7 +298,6 @@ linux64-aarch64-clang-19-raw:
toolchain:
- linux64-clang-19-stage1
- linux64-clang-19-profile
- linux64-aarch64-libxml2
- linux64-aarch64-toolchain-sysroot
linux64-aarch64-clang-19:
@@ -888,7 +886,6 @@ linux64-clang-20-raw:
toolchain:
- linux64-clang-20-stage1
- linux64-clang-20-profile
- linux64-libxml2
- linux64-toolchain-sysroot
linux64-clang-20:
@@ -948,7 +945,6 @@ linux64-aarch64-clang-20-raw:
toolchain:
- linux64-clang-20-stage1
- linux64-clang-20-profile
- linux64-aarch64-libxml2
- linux64-aarch64-toolchain-sysroot
linux64-aarch64-clang-20:
@@ -1535,7 +1531,6 @@ linux64-clang-trunk-raw:
toolchain:
- linux64-clang-trunk-stage1
- linux64-clang-trunk-profile
- linux64-libxml2
- linux64-toolchain-sysroot
linux64-clang-trunk:
@@ -1601,7 +1596,6 @@ linux64-aarch64-clang-trunk-raw:
toolchain:
- linux64-clang-trunk-stage1
- linux64-clang-trunk-profile
- linux64-aarch64-libxml2
- linux64-aarch64-toolchain-sysroot
linux64-aarch64-clang-trunk:

1
taskcluster/kinds/toolchain/kind.yml
View File

@@ -40,7 +40,6 @@ tasks-from:
- grcov.yml
- hostutils.yml
- libunwind.yml
- libxml2.yml
- llvm-symbolizer.yml
- macos-sdk.yml
- mingw.yml

54
taskcluster/kinds/toolchain/libxml2.yml
View File

@@ -1,54 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
---
task-defaults:
worker-type: b-linux-gcp
worker:
max-run-time: 1800
description: "libxml2 toolchain build"
run:
script: build-libxml2.sh
toolchain-artifact: public/build/libxml2.tar.zst
fetches:
fetch:
- libxml2
toolchain:
- linux64-clang-toolchain
linux64-libxml2:
treeherder:
symbol: TL(libxml2)
run:
arguments: ['x86_64-unknown-linux-gnu']
fetches:
toolchain:
- linux64-toolchain-sysroot
linux64-aarch64-libxml2:
treeherder:
symbol: TLA64(libxml2)
run:
arguments: ['aarch64-unknown-linux-gnu']
fetches:
toolchain:
- linux64-aarch64-toolchain-sysroot
win64-libxml2:
treeherder:
symbol: TW64(libxml2)
run:
arguments: ['x86_64-pc-windows-msvc']
fetches:
toolchain:
- vs-toolchain
win64-aarch64-libxml2:
description: "libxml2 toolchain build"
treeherder:
symbol: TWA64(libxml2)
run:
arguments: ['aarch64-pc-windows-msvc']
fetches:
toolchain:
- vs-toolchain

30
taskcluster/kinds/toolchain/misc.yml
View File

@@ -770,6 +770,36 @@ win64-cmake:
- linux64-clang-toolchain
- vs-toolchain
win64-libxml2:
description: "libxml2 toolchain build"
treeherder:
symbol: TW64(libxml2)
run:
script: build-libxml2.sh
arguments: ['x86_64-pc-windows-msvc']
toolchain-artifact: public/build/libxml2.tar.zst
fetches:
fetch:
- libxml2
toolchain:
- linux64-clang-toolchain
- vs-toolchain
win64-aarch64-libxml2:
description: "libxml2 toolchain build"
treeherder:
symbol: TWA64(libxml2)
run:
script: build-libxml2.sh
arguments: ['aarch64-pc-windows-msvc']
toolchain-artifact: public/build/libxml2.tar.zst
fetches:
fetch:
- libxml2
toolchain:
- linux64-clang-toolchain
- vs-toolchain
talos-pdfs:
description: "Gathers all the PDFs needed for the pdfpaint test"
attributes:

32
taskcluster/scripts/misc/build-libxml2.sh
View File

@@ -13,34 +13,18 @@ TARGET=${1?"First argument must be a valid value for CMAKE_C_COMPILER_TARGET"}
# actually need it, so just remove its creation.
sed -i /libxml2\\.rc/d CMakeLists.txt
case "$TARGET" in
*-pc-windows-msvc)
EXTRA_CMAKE_FLAGS="
-DCMAKE_C_COMPILER=clang-cl
-DCMAKE_LINKER=lld-link
-DCMAKE_MT=llvm-mt
-DCMAKE_C_FLAGS=\"-fuse-ld=lld -Xclang -ivfsoverlay -Xclang $MOZ_FETCHES_DIR/vs/overlay.yaml -winsysroot $MOZ_FETCHES_DIR/vs\"
-DCMAKE_EXE_LINKER_FLAGS=\"-winsysroot:$MOZ_FETCHES_DIR/vs\"
-DCMAKE_SYSTEM_NAME=Windows
-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded
"
;;
*-unknown-linux-gnu)
EXTRA_CMAKE_FLAGS="
-DCMAKE_C_COMPILER=clang
-DCMAKE_LINKER=clang
-DCMAKE_C_FLAGS=\"-fuse-ld=lld --sysroot=$MOZ_FETCHES_DIR/sysroot\"
-DCMAKE_EXE_LINKER_FLAGS=\"--sysroot=$MOZ_FETCHES_DIR/sysroot\"
"
;;
esac
eval cmake \
cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS=Off \
-DCMAKE_C_COMPILER=clang-cl \
-DCMAKE_C_COMPILER_TARGET=$TARGET \
$EXTRA_CMAKE_FLAGS \
-DCMAKE_LINKER=lld-link \
-DCMAKE_MT=llvm-mt \
-DCMAKE_C_FLAGS="-fuse-ld=lld -Xclang -ivfsoverlay -Xclang $MOZ_FETCHES_DIR/vs/overlay.yaml -winsysroot $MOZ_FETCHES_DIR/vs" \
-DCMAKE_EXE_LINKER_FLAGS="-winsysroot:$MOZ_FETCHES_DIR/vs" \
-DCMAKE_SYSTEM_NAME=Windows \
-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded \
-DLIBXML2_WITH_C14N=OFF \
-DLIBXML2_WITH_CATALOG=OFF \
-DLIBXML2_WITH_DEBUG=OFF \