[llvm] e115604 - Revert "[llvm] cmake config groundwork to have ZSTD in LLVM"

[Leonard Chan via llvm-commits]

Author: Leonard Chan
Date: 2022-07-08T13:46:44-07:00
New Revision: e115604a590a78aa7738e8b7fe15cd12de51b787

URL: https://github.com/llvm/llvm-project/commit/e115604a590a78aa7738e8b7fe15cd12de51b787
DIFF: https://github.com/llvm/llvm-project/commit/e115604a590a78aa7738e8b7fe15cd12de51b787.diff

LOG: Revert "[llvm] cmake config groundwork to have ZSTD in LLVM"

This reverts commit adf1ffe95854a245cbc48bbaea55f60b003d5f76 and f07caf20b9d35e45501c9d5d903fa182b3bdb95a
which seem to break upstream https://lab.llvm.org/buildbot/#/builders/109/builds/42253.

Added: 
    

Modified: 
    compiler-rt/test/lit.common.cfg.py
    llvm/lib/Support/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/lit.common.cfg.py b/compiler-rt/test/lit.common.cfg.py
index 90a6b0fa3382..a38c1308ecf4 100644
--- a/compiler-rt/test/lit.common.cfg.py
+++ b/compiler-rt/test/lit.common.cfg.py
@@ -217,7 +217,7 @@ def get_path_from_clang(args, allow_failure):
 
 if config.have_zlib == "1":
   config.available_features.add("zlib")
-
+  
 if config.have_zstd == "1":
   config.available_features.add("zstd")
 

diff  --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt
index 52b95c5377d3..e1045e459d70 100644
--- a/llvm/lib/Support/CMakeLists.txt
+++ b/llvm/lib/Support/CMakeLists.txt
@@ -25,10 +25,6 @@ if(LLVM_ENABLE_ZLIB)
   set(imported_libs ZLIB::ZLIB)
 endif()
 
-if(LLVM_ENABLE_ZSTD)
-  list(APPEND imported_libs zstd)
-endif()
-
 if( MSVC OR MINGW )
   # libuuid required for FOLDERID_Profile usage in lib/Support/Windows/Path.inc.
   # advapi32 required for CryptAcquireContextW in lib/Support/Windows/Path.inc.