[clang_toolchain] Do not use zlib with libxml2
When building libxml2 with zlib, lld isn't actually static linking against zlib.
Do not use zlib with libxml2 for now.
Change-Id: I42b25fe774e2fc3a3c7aead68da6e0442f699a11
diff --git a/recipes/clang_toolchain.expected/ci-linux-x64.json b/recipes/clang_toolchain.expected/ci-linux-x64.json
index 915f710..7a6815b 100644
--- a/recipes/clang_toolchain.expected/ci-linux-x64.json
+++ b/recipes/clang_toolchain.expected/ci-linux-x64.json
@@ -1052,7 +1052,6 @@
"--host=x86_64-linux-gnu",
"--disable-shared",
"--enable-static",
- "--with-zlib=[CLEANUP]/clang_tmp_1/zlib_install",
"--without-icu",
"--without-lzma",
"--without-python",
diff --git a/recipes/clang_toolchain.expected/ci-mac-x64.json b/recipes/clang_toolchain.expected/ci-mac-x64.json
index f4b0e4c..b8933da 100644
--- a/recipes/clang_toolchain.expected/ci-mac-x64.json
+++ b/recipes/clang_toolchain.expected/ci-mac-x64.json
@@ -1114,7 +1114,6 @@
"--host=x86_64-apple-darwin",
"--disable-shared",
"--enable-static",
- "--with-zlib=[CLEANUP]/clang_tmp_1/zlib_install",
"--without-icu",
"--without-lzma",
"--without-python",
diff --git a/recipes/clang_toolchain.expected/linux-arm64.json b/recipes/clang_toolchain.expected/linux-arm64.json
index 8e50089..62ef8fc 100644
--- a/recipes/clang_toolchain.expected/linux-arm64.json
+++ b/recipes/clang_toolchain.expected/linux-arm64.json
@@ -965,7 +965,6 @@
"--host=aarch64-linux-gnu",
"--disable-shared",
"--enable-static",
- "--with-zlib=[CLEANUP]/clang_tmp_1/zlib_install",
"--without-icu",
"--without-lzma",
"--without-python",
diff --git a/recipes/clang_toolchain.expected/prod-linux-x64.json b/recipes/clang_toolchain.expected/prod-linux-x64.json
index 3d5abcf..6e7e27e 100644
--- a/recipes/clang_toolchain.expected/prod-linux-x64.json
+++ b/recipes/clang_toolchain.expected/prod-linux-x64.json
@@ -1052,7 +1052,6 @@
"--host=x86_64-linux-gnu",
"--disable-shared",
"--enable-static",
- "--with-zlib=[CLEANUP]/clang_tmp_1/zlib_install",
"--without-icu",
"--without-lzma",
"--without-python",
diff --git a/recipes/clang_toolchain.expected/prod-mac-x64.json b/recipes/clang_toolchain.expected/prod-mac-x64.json
index 30a843f..04b5c96 100644
--- a/recipes/clang_toolchain.expected/prod-mac-x64.json
+++ b/recipes/clang_toolchain.expected/prod-mac-x64.json
@@ -1114,7 +1114,6 @@
"--host=x86_64-apple-darwin",
"--disable-shared",
"--enable-static",
- "--with-zlib=[CLEANUP]/clang_tmp_1/zlib_install",
"--without-icu",
"--without-lzma",
"--without-python",
diff --git a/recipes/clang_toolchain.py b/recipes/clang_toolchain.py
index bf859b4..409f023 100644
--- a/recipes/clang_toolchain.py
+++ b/recipes/clang_toolchain.py
@@ -121,7 +121,10 @@
'--host=%s' % target,
'--disable-shared',
'--enable-static',
- '--with-zlib=%s' % zlib_dir,
+ # TODO(phosek): libxml2 is now being built with zlib support, but lld
+ # is only linking the former, not the latter, and in case of static
+ # linking, this fails
+ #'--with-zlib=%s' % zlib_dir,
'--without-icu',
'--without-lzma',
'--without-python',
