[llvm] update to 12.0.0, enable zlib and libxml2 (#17302)

* [llvm] update to 12.0.0, enable zlib and libxml2

* [llvm] disable libxml2 by default, arm64-windows should be supported

* [llvm] try to fix build with ffi on Windows #17663

* [llvm] re-enable libxml2

* [llvm] fix formatting

* [llvm] overwrite version

* [mesa] update to v21.1.0

* [llvm] update ci.baseline

* [halide] update to the latest master commit

* [llvm] disable libxml2 port until complete PR #15390

* update versions

* [llvm] fix disabling of external libraries

* update version

* update ci.baseline

* update ci.baseline

* fix typo

* [llvm] fix libxml2 (depends on #17945)

* revert "[halide] update to the latest master commit"

* update versions

* [halide] fix zlib dependency for tools

* update versions

* [halide] update to official release v12.0.0

* update versions

* [halide] update to v12.0.1

* update version

* [mesa] remove llvm from defaults

* update version

* update ci.baseline

* [mesa] update to v21.1.2 and fix build with LLVM on Windows

* [llvm] allow to build libunwind project on Windows

* update versions

* [mesa] update ci.baseline.txt to disable x64-windows-static-md, may be fixed in the PR #18495

9 files changed, 123 insertions, 115 deletions

diff --git a/ports/llvm/0001-add-msvc-options.patch b/ports/llvm/0001-add-msvc-options.patch
deleted file mode 100644
index be5ad8189..000000000
--- a/ports/llvm/0001-add-msvc-options.patch
+++ /dev/null
@@ -1,31 +0,0 @@
- llvm/cmake/modules/HandleLLVMOptions.cmake | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake
-index 5ef22eb493ba..3e2f372e80c9 100644
---- a/llvm/cmake/modules/HandleLLVMOptions.cmake
-+++ b/llvm/cmake/modules/HandleLLVMOptions.cmake
-@@ -426,6 +426,12 @@ if( MSVC )
- 
-   append("/Zc:inline" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
- 
-+  # Some projects use the __cplusplus preprocessor macro to check support for
-+  # a particular version of the C++ standard. When this option is not specified
-+  # explicitly, macro's value is "199711L" that implies C++98 Standard.
-+  # https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/
-+  append("/Zc:__cplusplus" CMAKE_CXX_FLAGS)
-+
-   # Allow users to request PDBs in release mode. CMake offeres the
-   # RelWithDebInfo configuration, but it uses different optimization settings
-   # (/Ob1 vs /Ob2 or -O2 vs -O3). LLVM provides this flag so that users can get
-@@ -478,6 +484,10 @@ if( MSVC )
-       endif()
-     endif()
-   endif()
-+  # By default MSVC has a 2^16 limit on the number of sections in an object file,
-+  # but in many objects files need more than that. This flag is to increase the
-+  # number of sections.
-+  append("/bigobj" CMAKE_CXX_FLAGS)
- endif( MSVC )
- 
- # Warnings-as-errors handling for GCC-compatible compilers:
diff --git a/ports/llvm/0003-fix-openmp-debug.patch b/ports/llvm/0003-fix-openmp-debug.patch
index 577785afd..adf3c8ad0 100644
--- a/ports/llvm/0003-fix-openmp-debug.patch
+++ b/ports/llvm/0003-fix-openmp-debug.patch
@@ -1,9 +1,12 @@
+ openmp/runtime/src/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
 diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt
-index 81275c0483d..61468e048ec 100644
+index 822f9ca2b825..814e25864610 100644
 --- a/openmp/runtime/src/CMakeLists.txt
 +++ b/openmp/runtime/src/CMakeLists.txt
-@@ -136,7 +136,7 @@ libomp_get_ldflags(LIBOMP_CONFIGURED_LDFLAGS)
- add_library(omp ${LIBOMP_LIBRARY_KIND} ${LIBOMP_SOURCE_FILES})
+@@ -157,7 +157,7 @@ else()
+ endif()
  
  set_target_properties(omp PROPERTIES
 -  PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_LIB_FILE}"
@@ -11,7 +14,7 @@ index 81275c0483d..61468e048ec 100644
    LINK_FLAGS "${LIBOMP_CONFIGURED_LDFLAGS}"
    LINKER_LANGUAGE ${LIBOMP_LINKER_LANGUAGE}
  )
-@@ -215,7 +215,7 @@ if(WIN32)
+@@ -232,7 +232,7 @@ if(WIN32)
      # Create new import library that is just the previously created one + kmp_import.cpp
      add_library(ompimp STATIC ${LIBOMP_GENERATED_IMP_LIB} kmp_import.cpp)
      set_target_properties(ompimp PROPERTIES
diff --git a/ports/llvm/0006-workaround-msvc-bug.patch b/ports/llvm/0006-workaround-msvc-bug.patch
deleted file mode 100644
index db1574b9c..000000000
--- a/ports/llvm/0006-workaround-msvc-bug.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/llvm/lib/CodeGen/GlobalISel/LegalityPredicates.cpp b/llvm/lib/CodeGen/GlobalISel/LegalityPredicates.cpp
---- a/llvm/lib/CodeGen/GlobalISel/LegalityPredicates.cpp
-+++ b/llvm/lib/CodeGen/GlobalISel/LegalityPredicates.cpp
-@@ -10,6 +10,17 @@
- //
- //===----------------------------------------------------------------------===//
- 
-+// Disable optimizations to work around MSVC debug mode bug in 32-bit:
-+// https://developercommunity.visualstudio.com/content/problem/1179643/msvc-copies-overaligned-non-trivially-copyable-par.html
-+// FIXME: Remove this when the issue is closed.
-+#if defined(_MSC_VER) && !defined(__clang__) && defined(_M_IX86)
-+// We have to disable runtime checks in order to enable optimizations. This is
-+// done for the entire file because the problem is actually observed in STL
-+// template functions.
-+#pragma runtime_checks("", off)
-+#pragma optimize("gs", on)
-+#endif
-+
- #include "llvm/CodeGen/GlobalISel/LegalizerInfo.h"
- 
- using namespace llvm;
-diff --git a/llvm/unittests/CodeGen/GlobalISel/LegalizerInfoTest.cpp b/llvm/unittests/CodeGen/GlobalISel/LegalizerInfoTest.cpp
---- a/llvm/unittests/CodeGen/GlobalISel/LegalizerInfoTest.cpp
-+++ b/llvm/unittests/CodeGen/GlobalISel/LegalizerInfoTest.cpp
-@@ -406,3 +406,13 @@
-                                   32, 8, AtomicOrdering::NotAtomic }));
-   }
- }
-+
-+// This code sequence doesn't do anything, but it covers a previously uncovered
-+// codepath that used to crash in MSVC x86_32 debug mode.
-+TEST(LegalizerInfoTest, MSVCDebugMiscompile) {
-+  const LLT S1 = LLT::scalar(1);
-+  const LLT P0 = LLT::pointer(0, 32);
-+  LegalizerInfo LI;
-+  auto Builder = LI.getActionDefinitionsBuilder(TargetOpcode::G_PTRTOINT);
-+  (void)Builder.legalForCartesianProduct({S1}, {P0});
-+}
-
diff --git a/ports/llvm/0008-fix-libcxx-install.patch b/ports/llvm/0008-fix-libcxx-install.patch
index 3af957eaf..ec4019dc2 100644
--- a/ports/llvm/0008-fix-libcxx-install.patch
+++ b/ports/llvm/0008-fix-libcxx-install.patch
@@ -2,17 +2,17 @@
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt
-index 2001c09761d9..e17de934534f 100644
+index 9965104cb5b2..0d2a33c6b33c 100644
 --- a/libcxx/src/CMakeLists.txt
 +++ b/libcxx/src/CMakeLists.txt
-@@ -364,9 +364,7 @@ if (LIBCXX_INSTALL_LIBRARY)
-   # NOTE: This install command must go after the cxx install command otherwise
-   # it will not be executed after the library symlinks are installed.
-   if (LIBCXX_ENABLE_SHARED AND LIBCXX_ENABLE_ABI_LINKER_SCRIPT)
--    # Replace the libc++ filename with $<TARGET_LINKER_FILE:cxx>
--    # after we required CMake 3.0.
--    install(FILES "${LIBCXX_LIBRARY_DIR}/libc++${CMAKE_SHARED_LIBRARY_SUFFIX}"
-+    install(FILES "$<TARGET_LINKER_FILE:cxx_shared>"
-       DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR}
-       COMPONENT libcxx)
-   endif()
+@@ -372,9 +372,7 @@ endif()
+ # NOTE: This install command must go after the cxx install command otherwise
+ # it will not be executed after the library symlinks are installed.
+ if (LIBCXX_ENABLE_SHARED AND LIBCXX_ENABLE_ABI_LINKER_SCRIPT)
+-  # Replace the libc++ filename with $<TARGET_LINKER_FILE:cxx>
+-  # after we required CMake 3.0.
+-  install(FILES "${LIBCXX_LIBRARY_DIR}/libc++${CMAKE_SHARED_LIBRARY_SUFFIX}"
++  install(FILES "$<TARGET_LINKER_FILE:cxx_shared>"
+     DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR}
+     COMPONENT libcxx)
+ endif()
diff --git a/ports/llvm/0009-fix-tools-install-path.patch b/ports/llvm/0009-fix-tools-install-path.patch
index eb6c75bd6..b544feec0 100644
--- a/ports/llvm/0009-fix-tools-install-path.patch
+++ b/ports/llvm/0009-fix-tools-install-path.patch
@@ -74,10 +74,10 @@ index ec0702d76f18..9a34a09921b1 100644
    endforeach()
  
 diff --git a/clang/tools/scan-view/CMakeLists.txt b/clang/tools/scan-view/CMakeLists.txt
-index 22edb974bac7..60f69d358fb9 100644
+index dd3d33439299..ded0b5530ad9 100644
 --- a/clang/tools/scan-view/CMakeLists.txt
 +++ b/clang/tools/scan-view/CMakeLists.txt
-@@ -22,7 +22,7 @@ if(CLANG_INSTALL_SCANVIEW)
+@@ -19,7 +19,7 @@ if(CLANG_INSTALL_SCANVIEW)
                         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})
      list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})
      install(PROGRAMS bin/${BinFile}
@@ -100,10 +100,10 @@ index 62f2de0cb15c..38dc821c76de 100644
  
  add_custom_target(hmaptool ALL DEPENDS ${Depends})
 diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake
-index 7fe8b7e9f406..b338dddd0850 100644
+index ba36a234babf..1197a8d8ff32 100644
 --- a/flang/cmake/modules/AddFlang.cmake
 +++ b/flang/cmake/modules/AddFlang.cmake
-@@ -120,7 +120,7 @@ macro(add_flang_tool name)
+@@ -119,7 +119,7 @@ macro(add_flang_tool name)
  
      install(TARGETS ${name}
        ${export_to_flangtargets}
@@ -113,24 +113,24 @@ index 7fe8b7e9f406..b338dddd0850 100644
  
      if(NOT LLVM_ENABLE_IDE)
 diff --git a/flang/tools/f18/CMakeLists.txt b/flang/tools/f18/CMakeLists.txt
-index f3af6e8312fe..aa58108b332b 100644
+index 2e5350aecdc6..b4ab145846b5 100644
 --- a/flang/tools/f18/CMakeLists.txt
 +++ b/flang/tools/f18/CMakeLists.txt
-@@ -58,7 +58,7 @@ endforeach()
+@@ -63,12 +63,12 @@ endforeach()
  
  add_custom_target(module_files ALL DEPENDS ${MODULE_FILES})
  
 -install(TARGETS f18 DESTINATION bin)
 +install(TARGETS f18 DESTINATION tools/llvm)
  
- set(FLANG_INTRINSIC_MODULES_DIR ${FLANG_BINARY_DIR}/include/flang)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flang.sh.in ${CMAKE_BINARY_DIR}/tools/flang/bin/flang @ONLY)
-@@ -68,4 +68,4 @@ set(FLANG_INTRINSIC_MODULES_DIR ${CMAKE_INSTALL_PREFIX}/include/flang)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flang.sh.in ${FLANG_BINARY_DIR}/bin/flang-install.sh @ONLY)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/f18_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/f18_version.h @ONLY)
- 
--install(PROGRAMS ${FLANG_BINARY_DIR}/bin/flang-install.sh DESTINATION bin RENAME flang PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE)
-+install(PROGRAMS ${FLANG_BINARY_DIR}/bin/flang-install.sh DESTINATION tools/llvm RENAME flang PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE)
+ # This flang shell script will only work in a POSIX shell.
+ if (NOT WIN32)
+   file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/flang
+     DESTINATION ${CMAKE_BINARY_DIR}/bin
+     FILE_PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE)
+-  install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION bin)
++  install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION tools/llvm)
+ endif()
 diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake
 index 23df41312403..86f4eafeed07 100644
 --- a/lld/cmake/modules/AddLLD.cmake
@@ -145,7 +145,7 @@ index 23df41312403..86f4eafeed07 100644
  
      if(NOT CMAKE_CONFIGURATION_TYPES)
 diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt
-index e6f72fcd3488..0e5a2c81e825 100644
+index 5cff736ff57f..32f43bc1c9be 100644
 --- a/lld/tools/lld/CMakeLists.txt
 +++ b/lld/tools/lld/CMakeLists.txt
 @@ -21,7 +21,7 @@ target_link_libraries(lld
@@ -156,7 +156,7 @@ index e6f72fcd3488..0e5a2c81e825 100644
 +  RUNTIME DESTINATION tools/llvm)
  
  if(NOT LLD_SYMLINKS_TO_CREATE)
-   set(LLD_SYMLINKS_TO_CREATE lld-link ld.lld ld64.lld wasm-ld)
+   set(LLD_SYMLINKS_TO_CREATE
 diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake
 index 4ed5c647c5d2..cb31901dddbb 100644
 --- a/lldb/cmake/modules/AddLLDB.cmake
diff --git a/ports/llvm/0010-fix-libffi.patch b/ports/llvm/0010-fix-libffi.patch
new file mode 100644
index 000000000..e98825595
--- /dev/null
+++ b/ports/llvm/0010-fix-libffi.patch
@@ -0,0 +1,16 @@
+ llvm/cmake/config-ix.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake
+index 818fafbce148..66fc9f509ac7 100644
+--- a/llvm/cmake/config-ix.cmake
++++ b/llvm/cmake/config-ix.cmake
+@@ -335,7 +335,7 @@ if( LLVM_ENABLE_FFI )
+     message(FATAL_ERROR "libffi includes are not found.")
+   endif()
+ 
+-  find_library(FFI_LIBRARY_PATH ffi PATHS ${FFI_LIBRARY_DIR})
++  find_library(FFI_LIBRARY_PATH NAMES ffi libffi PATHS ${FFI_LIBRARY_DIR})
+   if( NOT FFI_LIBRARY_PATH )
+     message(FATAL_ERROR "libffi is not found.")
+   endif()
diff --git a/ports/llvm/0011-fix-libxml2.patch b/ports/llvm/0011-fix-libxml2.patch
new file mode 100644
index 000000000..b5deff09f
--- /dev/null
+++ b/ports/llvm/0011-fix-libxml2.patch
@@ -0,0 +1,34 @@
+ clang/tools/c-index-test/CMakeLists.txt | 6 +-----
+ lldb/cmake/modules/LLDBConfig.cmake     | 2 +-
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt
+index ceef4b086..40b9e9955 100644
+--- a/clang/tools/c-index-test/CMakeLists.txt
++++ b/clang/tools/c-index-test/CMakeLists.txt
+@@ -40,11 +40,7 @@ set_target_properties(c-index-test
+ 
+ # If libxml2 is available, make it available for c-index-test.
+ if (CLANG_HAVE_LIBXML)
+-  if ((CMAKE_OSX_SYSROOT) AND (EXISTS ${CMAKE_OSX_SYSROOT}/${LIBXML2_INCLUDE_DIR}))
+-    include_directories(SYSTEM ${CMAKE_OSX_SYSROOT}/${LIBXML2_INCLUDE_DIR})
+-  else()
+-    include_directories(SYSTEM ${LIBXML2_INCLUDE_DIR})
+-  endif()
++  include_directories(SYSTEM ${LIBXML2_INCLUDE_DIRS})
+   target_link_libraries(c-index-test PRIVATE ${LIBXML2_LIBRARIES})
+ endif()
+ 
+diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake
+index 2fdf1502d..beeeeb9b1 100644
+--- a/lldb/cmake/modules/LLDBConfig.cmake
++++ b/lldb/cmake/modules/LLDBConfig.cmake
+@@ -214,7 +214,7 @@ if (LLDB_ENABLE_LZMA)
+ endif()
+ 
+ if (LLDB_ENABLE_LIBXML2)
+-  include_directories(${LIBXML2_INCLUDE_DIR})
++  include_directories(${LIBXML2_INCLUDE_DIRS})
+ endif()
+ 
+ include_directories(BEFORE
diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
index 356a25bf1..c242f99e4 100644
--- a/ports/llvm/portfile.cmake
+++ b/ports/llvm/portfile.cmake
@@ -1,4 +1,4 @@
-set(LLVM_VERSION "11.1.0")
+set(LLVM_VERSION "12.0.0")
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
@@ -6,18 +6,18 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO llvm/llvm-project
     REF llvmorg-${LLVM_VERSION}
-    SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
+    SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
     HEAD_REF master
     PATCHES
-        0001-add-msvc-options.patch     # Fixed in LLVM 12.0.0
         0002-fix-install-paths.patch    # This patch fixes paths in ClangConfig.cmake, LLVMConfig.cmake, LLDConfig.cmake etc.
         0003-fix-openmp-debug.patch
         0004-fix-dr-1734.patch
         0005-fix-tools-path.patch
-        0006-workaround-msvc-bug.patch  # Fixed in LLVM 12.0.0
         0007-fix-compiler-rt-install-path.patch
         0008-fix-libcxx-install.patch
         0009-fix-tools-install-path.patch
+        0010-fix-libffi.patch
+        0011-fix-libxml2.patch
 )
 
 vcpkg_check_features(
@@ -43,6 +43,25 @@ list(APPEND FEATURE_OPTIONS
     -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON
 )
 
+# Force enable or disable external libraries
+set(llvm_external_libraries
+    zlib
+    libxml2
+)
+foreach(external_library IN LISTS llvm_external_libraries)
+    string(TOLOWER "enable-${external_library}" feature_name)
+    string(TOUPPER "LLVM_ENABLE_${external_library}" define_name)
+    if(feature_name IN_LIST FEATURES)
+        list(APPEND FEATURE_OPTIONS
+            -D${define_name}=FORCE_ON
+        )
+    else()
+        list(APPEND FEATURE_OPTIONS
+            -D${define_name}=OFF
+        )
+    endif()
+endforeach()
+
 # By default assertions are enabled for Debug configuration only.
 if("enable-assertions" IN_LIST FEATURES)
     # Force enable assertions for all configurations.
@@ -119,9 +138,6 @@ if("libcxxabi" IN_LIST FEATURES)
     list(APPEND LLVM_ENABLE_PROJECTS "libcxxabi")
 endif()
 if("libunwind" IN_LIST FEATURES)
-    if(VCPKG_TARGET_IS_WINDOWS)
-        message(FATAL_ERROR "Building libunwind with MSVC is not supported. Disable it until issues are fixed.")
-    endif()
     list(APPEND LLVM_ENABLE_PROJECTS "libunwind")
 endif()
 if("lld" IN_LIST FEATURES)
@@ -204,9 +220,6 @@ vcpkg_configure_cmake(
         -DLLVM_BUILD_EXAMPLES=OFF
         -DLLVM_INCLUDE_TESTS=OFF
         -DLLVM_BUILD_TESTS=OFF
-        # Disable optional dependencies to libxml2 and zlib.
-        -DLLVM_ENABLE_LIBXML2=OFF
-        -DLLVM_ENABLE_ZLIB=OFF
         # Force TableGen to be built with optimization. This will significantly improve build time.
         -DLLVM_OPTIMIZED_TABLEGEN=ON
         "-DLLVM_ENABLE_PROJECTS=${LLVM_ENABLE_PROJECTS}"
diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json
index 4590e5111..06ef3712b 100644
--- a/ports/llvm/vcpkg.json
+++ b/ports/llvm/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "llvm",
-  "version-string": "11.1.0",
+  "version-string": "12.0.0",
   "description": "The LLVM Compiler Infrastructure.",
   "homepage": "https://llvm.org",
   "supports": "!uwp",
@@ -42,9 +42,9 @@
             "disable-assertions",
             "disable-clang-static-analyzer",
             "enable-bindings",
-            "enable-rtti",
             "enable-terminfo",
-            "enable-threads"
+            "enable-threads",
+            "enable-zlib"
           ]
         }
       ]
@@ -122,6 +122,12 @@
         "libffi"
       ]
     },
+    "enable-libxml2": {
+      "description": "Build with LibXml2.",
+      "dependencies": [
+        "libxml2"
+      ]
+    },
     "enable-rtti": {
       "description": "Build LLVM with run-time type information."
     },
@@ -131,6 +137,12 @@
     "enable-threads": {
       "description": "Use threads if available."
     },
+    "enable-zlib": {
+      "description": "Build with ZLib.",
+      "dependencies": [
+        "zlib"
+      ]
+    },
     "flang": {
       "description": "Include Fortran front end.",
       "dependencies": [