[clang] Run lld tests on clang builder
This patch adds 'check-lld' to the clang.py recipe. This patch also
addresses a few issues introduced in
e18e0e9b5dfb0c96eb202d3bc67da85d833df802.
Bug: 335328196
Change-Id: Ia9efc2793223e3279eb2b3b944defcfef77c72f7
Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/1069183
Commit-Queue: Haowei Wu <haowei@google.com>
Reviewed-by: Petr Hosek <phosek@google.com>
diff --git a/recipes/contrib/clang.expected/ci_linux_x64.json b/recipes/contrib/clang.expected/ci_linux_x64.json
index 3e21600..bbef6cd 100644
--- a/recipes/contrib/clang.expected/ci_linux_x64.json
+++ b/recipes/contrib/clang.expected/ci_linux_x64.json
@@ -2157,7 +2157,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[START_DIR]/build-zlib-x86_64-unknown-linux-gnu"
+ "[START_DIR]/build-zlib-x86_64-linux-gnu"
],
"env": {
"GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -2181,7 +2181,7 @@
"hostname": "rdbhost"
}
},
- "name": "build llvm dependencies.zlib.create build dir for zlib for x86_64-unknown-linux-gnu",
+ "name": "build llvm dependencies.zlib.create build dir for zlib for x86_64-linux-gnu",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -2196,7 +2196,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[START_DIR]/install-zlib-x86_64-unknown-linux-gnu"
+ "[START_DIR]/install-zlib-x86_64-linux-gnu"
],
"env": {
"GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -2220,7 +2220,7 @@
"hostname": "rdbhost"
}
},
- "name": "build llvm dependencies.zlib.create install dir for zlib for x86_64-unknown-linux-gnu",
+ "name": "build llvm dependencies.zlib.create install dir for zlib for x86_64-linux-gnu",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -2382,7 +2382,7 @@
"-S",
"[START_DIR]/fuchsia-third_party-zlib",
"-B",
- "[START_DIR]/build-zlib-x86_64-unknown-linux-gnu",
+ "[START_DIR]/build-zlib-x86_64-linux-gnu",
"-G",
"Ninja",
"-DCMAKE_BUILD_TYPE=Release",
@@ -2405,9 +2405,9 @@
"-DCMAKE_CXX_COMPILER_LAUNCHER=[CACHE]/goma/client/gomacc",
"-DCMAKE_ASM_COMPILER_LAUNCHER=[CACHE]/goma/client/gomacc",
"-DCMAKE_SHARED_LINKER_FLAGS=-Wl,--undefined-version",
- "-DCMAKE_C_FLAGS=--target=x86_64-unknown-linux-gnu",
- "-DCMAKE_CXX_FLAGS=--target=x86_64-unknown-linux-gnu",
- "-DCMAKE_ASM_FLAGS=--target=x86_64-unknown-linux-gnu"
+ "-DCMAKE_C_FLAGS=--target=x86_64-linux-gnu",
+ "-DCMAKE_CXX_FLAGS=--target=x86_64-linux-gnu",
+ "-DCMAKE_ASM_FLAGS=--target=x86_64-linux-gnu"
],
"env": {
"GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -2439,7 +2439,7 @@
"cmd": [
"[START_DIR]/cipd_tool/fuchsia/third_party/ninja/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/ninja",
"-C",
- "[START_DIR]/build-zlib-x86_64-unknown-linux-gnu",
+ "[START_DIR]/build-zlib-x86_64-linux-gnu",
"-j8"
],
"env": {
@@ -2473,11 +2473,11 @@
"cmd": [
"[START_DIR]/cipd_tool/fuchsia/third_party/ninja/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/ninja",
"-C",
- "[START_DIR]/build-zlib-x86_64-unknown-linux-gnu",
+ "[START_DIR]/build-zlib-x86_64-linux-gnu",
"install"
],
"env": {
- "DESTDIR": "[START_DIR]/install-zlib-x86_64-unknown-linux-gnu",
+ "DESTDIR": "[START_DIR]/install-zlib-x86_64-linux-gnu",
"GOMA_TMP_DIR": "[CLEANUP]/goma",
"GOMA_USE_LOCAL": "False",
"NINJA_STATUS": "[%f/%t](%r) "
@@ -3362,7 +3362,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[START_DIR]/build-zstd-x86_64-unknown-linux-gnu"
+ "[START_DIR]/build-zstd-x86_64-linux-gnu"
],
"env": {
"GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -3386,7 +3386,7 @@
"hostname": "rdbhost"
}
},
- "name": "build llvm dependencies.zstd.create build dir for zstd for x86_64-unknown-linux-gnu",
+ "name": "build llvm dependencies.zstd.create build dir for zstd for x86_64-linux-gnu",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -3401,7 +3401,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[START_DIR]/install-zstd-x86_64-unknown-linux-gnu"
+ "[START_DIR]/install-zstd-x86_64-linux-gnu"
],
"env": {
"GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -3425,7 +3425,7 @@
"hostname": "rdbhost"
}
},
- "name": "build llvm dependencies.zstd.create install dir for zstd for x86_64-unknown-linux-gnu",
+ "name": "build llvm dependencies.zstd.create install dir for zstd for x86_64-linux-gnu",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -3436,7 +3436,7 @@
"-S",
"[START_DIR]/fuchsia-third_party-zstd/build/cmake",
"-B",
- "[START_DIR]/build-zstd-x86_64-unknown-linux-gnu",
+ "[START_DIR]/build-zstd-x86_64-linux-gnu",
"-G",
"Ninja",
"-DCMAKE_BUILD_TYPE=Release",
@@ -3460,9 +3460,9 @@
"-DCMAKE_ASM_COMPILER_LAUNCHER=[CACHE]/goma/client/gomacc",
"-DZSTD_BUILD_SHARED=OFF",
"-DCMAKE_POSITION_INDEPENDENT_CODE=ON",
- "-DCMAKE_C_FLAGS=--target=x86_64-unknown-linux-gnu",
- "-DCMAKE_CXX_FLAGS=--target=x86_64-unknown-linux-gnu",
- "-DCMAKE_ASM_FLAGS=--target=x86_64-unknown-linux-gnu"
+ "-DCMAKE_C_FLAGS=--target=x86_64-linux-gnu",
+ "-DCMAKE_CXX_FLAGS=--target=x86_64-linux-gnu",
+ "-DCMAKE_ASM_FLAGS=--target=x86_64-linux-gnu"
],
"env": {
"GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -3494,7 +3494,7 @@
"cmd": [
"[START_DIR]/cipd_tool/fuchsia/third_party/ninja/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/ninja",
"-C",
- "[START_DIR]/build-zstd-x86_64-unknown-linux-gnu",
+ "[START_DIR]/build-zstd-x86_64-linux-gnu",
"-j8"
],
"env": {
@@ -3528,11 +3528,11 @@
"cmd": [
"[START_DIR]/cipd_tool/fuchsia/third_party/ninja/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/ninja",
"-C",
- "[START_DIR]/build-zstd-x86_64-unknown-linux-gnu",
+ "[START_DIR]/build-zstd-x86_64-linux-gnu",
"install"
],
"env": {
- "DESTDIR": "[START_DIR]/install-zstd-x86_64-unknown-linux-gnu",
+ "DESTDIR": "[START_DIR]/install-zstd-x86_64-linux-gnu",
"GOMA_TMP_DIR": "[CLEANUP]/goma",
"GOMA_USE_LOCAL": "False",
"NINJA_STATUS": "[%f/%t](%r) "
@@ -4418,7 +4418,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[START_DIR]/build-libxml2-x86_64-unknown-linux-gnu"
+ "[START_DIR]/build-libxml2-x86_64-linux-gnu"
],
"env": {
"GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -4442,7 +4442,7 @@
"hostname": "rdbhost"
}
},
- "name": "build llvm dependencies.libxml2.create build dir for libxml2 for x86_64-unknown-linux-gnu",
+ "name": "build llvm dependencies.libxml2.create build dir for libxml2 for x86_64-linux-gnu",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -4457,7 +4457,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[START_DIR]/install-libxml2-x86_64-unknown-linux-gnu"
+ "[START_DIR]/install-libxml2-x86_64-linux-gnu"
],
"env": {
"GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -4481,7 +4481,7 @@
"hostname": "rdbhost"
}
},
- "name": "build llvm dependencies.libxml2.create install dir for libxml2 for x86_64-unknown-linux-gnu",
+ "name": "build llvm dependencies.libxml2.create install dir for libxml2 for x86_64-linux-gnu",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -4492,7 +4492,7 @@
"-S",
"[START_DIR]/fuchsia-third_party-libxml2",
"-B",
- "[START_DIR]/build-libxml2-x86_64-unknown-linux-gnu",
+ "[START_DIR]/build-libxml2-x86_64-linux-gnu",
"-G",
"Ninja",
"-DCMAKE_BUILD_TYPE=Release",
@@ -4522,10 +4522,10 @@
"-DLIBXML2_WITH_PYTHON=OFF",
"-DLIBXML2_WITH_TESTS=OFF",
"-DLIBXML2_WITH_ZLIB=OFF",
- "-DCMAKE_C_FLAGS=--target=x86_64-unknown-linux-gnu",
- "-DCMAKE_CXX_FLAGS=--target=x86_64-unknown-linux-gnu",
- "-DCMAKE_ASM_FLAGS=--target=x86_64-unknown-linux-gnu",
- "-DCMAKE_INSTALL_PREFIX=[START_DIR]/install-libxml2-x86_64-unknown-linux-gnu"
+ "-DCMAKE_C_FLAGS=--target=x86_64-linux-gnu",
+ "-DCMAKE_CXX_FLAGS=--target=x86_64-linux-gnu",
+ "-DCMAKE_ASM_FLAGS=--target=x86_64-linux-gnu",
+ "-DCMAKE_INSTALL_PREFIX=[START_DIR]/install-libxml2-x86_64-linux-gnu"
],
"env": {
"GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -4557,7 +4557,7 @@
"cmd": [
"[START_DIR]/cipd_tool/fuchsia/third_party/ninja/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/ninja",
"-C",
- "[START_DIR]/build-libxml2-x86_64-unknown-linux-gnu",
+ "[START_DIR]/build-libxml2-x86_64-linux-gnu",
"-j8"
],
"env": {
@@ -4591,7 +4591,7 @@
"cmd": [
"[START_DIR]/cipd_tool/fuchsia/third_party/ninja/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/ninja",
"-C",
- "[START_DIR]/build-libxml2-x86_64-unknown-linux-gnu",
+ "[START_DIR]/build-libxml2-x86_64-linux-gnu",
"install"
],
"env": {
@@ -5694,7 +5694,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[START_DIR]/build-boringssl-x86_64-unknown-linux-gnu"
+ "[START_DIR]/build-boringssl-x86_64-linux-gnu"
],
"env": {
"GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -5718,7 +5718,7 @@
"hostname": "rdbhost"
}
},
- "name": "build llvm dependencies.boringssl.create build dir for boringssl for x86_64-unknown-linux-gnu",
+ "name": "build llvm dependencies.boringssl.create build dir for boringssl for x86_64-linux-gnu",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -5733,7 +5733,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[START_DIR]/install-boringssl-x86_64-unknown-linux-gnu"
+ "[START_DIR]/install-boringssl-x86_64-linux-gnu"
],
"env": {
"GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -5757,7 +5757,7 @@
"hostname": "rdbhost"
}
},
- "name": "build llvm dependencies.boringssl.create install dir for boringssl for x86_64-unknown-linux-gnu",
+ "name": "build llvm dependencies.boringssl.create install dir for boringssl for x86_64-linux-gnu",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -5768,7 +5768,7 @@
"-S",
"[START_DIR]/boringssl-boringssl",
"-B",
- "[START_DIR]/build-boringssl-x86_64-unknown-linux-gnu",
+ "[START_DIR]/build-boringssl-x86_64-linux-gnu",
"-G",
"Ninja",
"-DCMAKE_BUILD_TYPE=Release",
@@ -5792,9 +5792,9 @@
"-DCMAKE_ASM_COMPILER_LAUNCHER=[CACHE]/goma/client/gomacc",
"-DCMAKE_POSITION_INDEPENDENT_CODE=ON",
"-DGO_EXECUTABLE=[START_DIR]/cipd/go/bin/go",
- "-DCMAKE_C_FLAGS=--target=x86_64-unknown-linux-gnu",
- "-DCMAKE_CXX_FLAGS=--target=x86_64-unknown-linux-gnu",
- "-DCMAKE_ASM_FLAGS=--target=x86_64-unknown-linux-gnu"
+ "-DCMAKE_C_FLAGS=--target=x86_64-linux-gnu",
+ "-DCMAKE_CXX_FLAGS=--target=x86_64-linux-gnu",
+ "-DCMAKE_ASM_FLAGS=--target=x86_64-linux-gnu"
],
"env": {
"GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -5826,7 +5826,7 @@
"cmd": [
"[START_DIR]/cipd_tool/fuchsia/third_party/ninja/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/ninja",
"-C",
- "[START_DIR]/build-boringssl-x86_64-unknown-linux-gnu",
+ "[START_DIR]/build-boringssl-x86_64-linux-gnu",
"-j8"
],
"env": {
@@ -5860,11 +5860,11 @@
"cmd": [
"[START_DIR]/cipd_tool/fuchsia/third_party/ninja/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/ninja",
"-C",
- "[START_DIR]/build-boringssl-x86_64-unknown-linux-gnu",
+ "[START_DIR]/build-boringssl-x86_64-linux-gnu",
"install"
],
"env": {
- "DESTDIR": "[START_DIR]/install-boringssl-x86_64-unknown-linux-gnu",
+ "DESTDIR": "[START_DIR]/install-boringssl-x86_64-linux-gnu",
"GOMA_TMP_DIR": "[CLEANUP]/goma",
"GOMA_USE_LOCAL": "False",
"NINJA_STATUS": "[%f/%t](%r) "
@@ -6750,7 +6750,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[START_DIR]/build-curl-x86_64-unknown-linux-gnu"
+ "[START_DIR]/build-curl-x86_64-linux-gnu"
],
"env": {
"GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -6774,7 +6774,7 @@
"hostname": "rdbhost"
}
},
- "name": "build llvm dependencies.curl.create build dir for curl for x86_64-unknown-linux-gnu",
+ "name": "build llvm dependencies.curl.create build dir for curl for x86_64-linux-gnu",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -6789,7 +6789,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[START_DIR]/install-curl-x86_64-unknown-linux-gnu"
+ "[START_DIR]/install-curl-x86_64-linux-gnu"
],
"env": {
"GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -6813,7 +6813,7 @@
"hostname": "rdbhost"
}
},
- "name": "build llvm dependencies.curl.create install dir for curl for x86_64-unknown-linux-gnu",
+ "name": "build llvm dependencies.curl.create install dir for curl for x86_64-linux-gnu",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -6824,7 +6824,7 @@
"-S",
"[START_DIR]/fuchsia-third_party-curl",
"-B",
- "[START_DIR]/build-curl-x86_64-unknown-linux-gnu",
+ "[START_DIR]/build-curl-x86_64-linux-gnu",
"-G",
"Ninja",
"-DCMAKE_BUILD_TYPE=Release",
@@ -6849,12 +6849,12 @@
"-DBUILD_SHARED_LIBS=OFF",
"-DCURL_USE_OPENSSL=ON",
"-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON",
- "-DOpenSSL_ROOT=[START_DIR]/install-boringssl-x86_64-unknown-linux-gnu/lib/cmake/OpenSSL",
- "-DZLIB_INCLUDE_DIR=[START_DIR]/install-zlib-x86_64-unknown-linux-gnu/include",
- "-DZLIB_LIBRARY=[START_DIR]/install-zlib-x86_64-unknown-linux-gnu/lib/libz.a",
- "-DCMAKE_C_FLAGS=--target=x86_64-unknown-linux-gnu",
- "-DCMAKE_CXX_FLAGS=--target=x86_64-unknown-linux-gnu",
- "-DCMAKE_ASM_FLAGS=--target=x86_64-unknown-linux-gnu"
+ "-DOpenSSL_ROOT=[START_DIR]/install-boringssl-x86_64-linux-gnu/lib/cmake/OpenSSL",
+ "-DZLIB_INCLUDE_DIR=[START_DIR]/install-zlib-x86_64-linux-gnu/include",
+ "-DZLIB_LIBRARY=[START_DIR]/install-zlib-x86_64-linux-gnu/lib/libz.a",
+ "-DCMAKE_C_FLAGS=--target=x86_64-linux-gnu",
+ "-DCMAKE_CXX_FLAGS=--target=x86_64-linux-gnu",
+ "-DCMAKE_ASM_FLAGS=--target=x86_64-linux-gnu"
],
"env": {
"GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -6886,7 +6886,7 @@
"cmd": [
"[START_DIR]/cipd_tool/fuchsia/third_party/ninja/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/ninja",
"-C",
- "[START_DIR]/build-curl-x86_64-unknown-linux-gnu",
+ "[START_DIR]/build-curl-x86_64-linux-gnu",
"-j8"
],
"env": {
@@ -6920,11 +6920,11 @@
"cmd": [
"[START_DIR]/cipd_tool/fuchsia/third_party/ninja/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/ninja",
"-C",
- "[START_DIR]/build-curl-x86_64-unknown-linux-gnu",
+ "[START_DIR]/build-curl-x86_64-linux-gnu",
"install"
],
"env": {
- "DESTDIR": "[START_DIR]/install-curl-x86_64-unknown-linux-gnu",
+ "DESTDIR": "[START_DIR]/install-curl-x86_64-linux-gnu",
"GOMA_TMP_DIR": "[CLEANUP]/goma",
"GOMA_USE_LOCAL": "False",
"NINJA_STATUS": "[%f/%t](%r) "
@@ -7806,7 +7806,7 @@
"-S",
"[START_DIR]/llvm-third_party-cpp-httplib",
"-B",
- "[START_DIR]/build-cpp-httplib-x86_64-unknown-linux-gnu",
+ "[START_DIR]/build-cpp-httplib-x86_64-linux-gnu",
"-G",
"Ninja",
"-DCMAKE_BUILD_TYPE=Release",
@@ -7828,12 +7828,12 @@
"-DCMAKE_C_COMPILER_LAUNCHER=[CACHE]/goma/client/gomacc",
"-DCMAKE_CXX_COMPILER_LAUNCHER=[CACHE]/goma/client/gomacc",
"-DCMAKE_ASM_COMPILER_LAUNCHER=[CACHE]/goma/client/gomacc",
- "-DCMAKE_INSTALL_PREFIX=[START_DIR]/install-cpp-httplib-x86_64-unknown-linux-gnu",
+ "-DCMAKE_INSTALL_PREFIX=[START_DIR]/install-cpp-httplib-x86_64-linux-gnu",
"-DHTTPLIB_USE_BROTLI_IF_AVAILABLE=OFF",
"-DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=OFF",
"-DHTTPLIB_REQUIRE_ZLIB=ON",
- "-DZLIB_INCLUDE_DIR=[START_DIR]/install-zlib-x86_64-unknown-linux-gnu/include",
- "-DZLIB_LIBRARY=[START_DIR]/install-zlib-x86_64-unknown-linux-gnu/lib/libz.a"
+ "-DZLIB_INCLUDE_DIR=[START_DIR]/install-zlib-x86_64-linux-gnu/include",
+ "-DZLIB_LIBRARY=[START_DIR]/install-zlib-x86_64-linux-gnu/lib/libz.a"
],
"env": {
"GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -7865,7 +7865,7 @@
"cmd": [
"[START_DIR]/cipd_tool/fuchsia/third_party/ninja/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/ninja",
"-C",
- "[START_DIR]/build-cpp-httplib-x86_64-unknown-linux-gnu",
+ "[START_DIR]/build-cpp-httplib-x86_64-linux-gnu",
"install"
],
"env": {
@@ -7967,17 +7967,17 @@
"-DCMAKE_ASM_COMPILER_LAUNCHER=[CACHE]/goma/client/gomacc",
"-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON",
"-DLLVM_ENABLE_ZLIB=FORCE_ON",
- "-DZLIB_INCLUDE_DIR=[START_DIR]/install-zlib-x86_64-unknown-linux-gnu/include",
- "-DZLIB_LIBRARY=[START_DIR]/install-zlib-x86_64-unknown-linux-gnu/lib/libz.a",
+ "-DZLIB_INCLUDE_DIR=[START_DIR]/install-zlib-x86_64-linux-gnu/include",
+ "-DZLIB_LIBRARY=[START_DIR]/install-zlib-x86_64-linux-gnu/lib/libz.a",
"-DLLVM_ENABLE_ZSTD=FORCE_ON",
- "-Dzstd_DIR=[START_DIR]/install-zstd-x86_64-unknown-linux-gnu/lib/cmake/zstd",
+ "-Dzstd_DIR=[START_DIR]/install-zstd-x86_64-linux-gnu/lib/cmake/zstd",
"-DLLVM_ENABLE_LIBXML2=FORCE_ON",
- "-DLibXml2_ROOT=[START_DIR]/install-libxml2-x86_64-unknown-linux-gnu/lib/cmake/libxml2-2.9.10",
- "-DOpenSSL_ROOT=[START_DIR]/install-boringssl-x86_64-unknown-linux-gnu/lib/cmake/OpenSSL",
+ "-DLibXml2_ROOT=[START_DIR]/install-libxml2-x86_64-linux-gnu/lib/cmake/libxml2-2.9.10",
+ "-DOpenSSL_ROOT=[START_DIR]/install-boringssl-x86_64-linux-gnu/lib/cmake/OpenSSL",
"-DLLVM_ENABLE_CURL=FORCE_ON",
- "-DCURL_ROOT=[START_DIR]/install-curl-x86_64-unknown-linux-gnu/lib/cmake/CURL",
+ "-DCURL_ROOT=[START_DIR]/install-curl-x86_64-linux-gnu/lib/cmake/CURL",
"-DLLVM_ENABLE_HTTPLIB=FORCE_ON",
- "-Dhttplib_ROOT=[START_DIR]/install-cpp-httplib-x86_64-unknown-linux-gnu/lib/cmake/httplib",
+ "-Dhttplib_ROOT=[START_DIR]/install-cpp-httplib-x86_64-linux-gnu/lib/cmake/httplib",
"-DTENSORFLOW_AOT_PATH=[CLEANUP]/tensorflow-venv/lib/python3.8/site-packages/tensorflow",
"-DLLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL=[START_DIR]/cipd/model/InlinerSizeModel.h",
"-DLLVM_OVERRIDE_MODEL_OBJECT_INLINERSIZEMODEL=[START_DIR]/cipd/model/InlinerSizeModel.o",
@@ -8364,7 +8364,8 @@
"[START_DIR]/llvm_build",
"-j80",
"check-clang",
- "check-llvm"
+ "check-llvm",
+ "check-lld"
],
"env": {
"CLANG_MODULE_CACHE_PATH": "",
diff --git a/recipes/contrib/clang.py b/recipes/contrib/clang.py
index e832439..8dd5f20 100644
--- a/recipes/contrib/clang.py
+++ b/recipes/contrib/clang.py
@@ -14,6 +14,7 @@
"fuchsia/go",
"fuchsia/goma",
"fuchsia/ninja",
+ "fuchsia/platform_util",
"fuchsia/tensorflow",
"fuchsia/toolchain",
"fuchsia/toolchain_3p_libs",
@@ -47,7 +48,7 @@
host_platform = api.cipd_util.platform_name
target_platform = props.platform or host_platform
use_breakpad = host_platform == "linux-amd64"
- use_ml_inlining = target_platform not in ("linux-arm64", "mac-arm64")
+ enable_ml_inliner = target_platform not in ("linux-arm64", "mac-arm64")
manifest = Manifest()
staging_dir = api.path.start_dir
pkg_dir = staging_dir.joinpath("llvm_install")
@@ -57,7 +58,7 @@
api,
target_platform,
use_breakpad=use_breakpad,
- use_ml_inlining=use_ml_inlining,
+ enable_ml_inliner=enable_ml_inliner,
manifest=manifest,
)
llvm_dir, revision = api.git_checkout(props.repository, fallback_ref=props.revision)
@@ -65,8 +66,8 @@
git_checkout.repo_url = props.repository
git_checkout.revision = revision
env_prefixes = {"PATH": [cipd_dir.joinpath("bin")]}
- target_triple = api.toolchain.PLATFORM_TO_TRIPLE[target_platform]
- host_triple = api.toolchain.PLATFORM_TO_TRIPLE[host_platform]
+ target_triple = api.platform_util.platform(target_platform).triple
+ host_triple = api.platform_util.platform(host_platform).triple
linux_sysroot = cipd_dir.joinpath("linux")
with remote_build_context, api.context(env_prefixes=env_prefixes):
@@ -152,7 +153,7 @@
)
options.extend(api.toolchain.httplib_deps_flags(cpp_httplib_install_dir))
- if use_ml_inlining:
+ if enable_ml_inliner:
options.extend(
[
f"-DTENSORFLOW_AOT_PATH={api.tensorflow.path}",
@@ -201,6 +202,7 @@
[
"check-clang",
"check-llvm",
+ "check-lld",
],
ninja_jobs=ninja_jobs,
build_dir=build_dir,
@@ -208,7 +210,7 @@
def ensure_llvm_deps_prebuilts(
- api, target_platform, use_breakpad=False, use_ml_inlining=False, manifest=None
+ api, target_platform, use_breakpad=False, enable_ml_inliner=False, manifest=None
):
with api.step.nest("ensure packages"):
cipd_dir = api.path.start_dir.joinpath("cipd")
@@ -226,7 +228,7 @@
"git_revision:fa7a5a9710540f30ff98ae48b62f2cdf72ed2acd",
"focal",
)
- if use_ml_inlining:
+ if enable_ml_inliner:
pkgs.add_package(
f"fuchsia/model/inlining/{target_platform}",
"git_revision:0ee1ce61a844b8fd285ff1a2c47c4b8690fd2b7d",
