[llvm] cc26121 - [gn build] (manually) merge 3ab01550b

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2020-08-05T08:56:14-04:00
New Revision: cc2612185833a0e4b7a19bfbde801ced9297b0f7

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

LOG: [gn build] (manually) merge 3ab01550b

This reverts commit 0bbaacc8cae0373d4500c4e3f6f128d21f9033b7 and
2ad56119f5dc6c6af2b8ddfd9fc8c6460a7507c8 which merged 10b1b4a23
(and follow-ups), since that change was reverted in 3ab01550b.

Added: 
    

Modified: 
    llvm/utils/gn/secondary/clang/test/BUILD.gn
    llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn
    llvm/utils/gn/secondary/lld/test/BUILD.gn
    llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
    llvm/utils/gn/secondary/llvm/test/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/clang/test/BUILD.gn b/llvm/utils/gn/secondary/clang/test/BUILD.gn
index a0680d984823..56feaae9a149 100644
--- a/llvm/utils/gn/secondary/clang/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/test/BUILD.gn
@@ -79,9 +79,9 @@ write_lit_config("lit_site_cfg") {
   }
 
   if (llvm_enable_zlib) {
-    extra_values += [ "LLVM_ENABLE_ZLIB=1" ]
+    extra_values += [ "HAVE_LIBZ=1" ]
   } else {
-    extra_values += [ "LLVM_ENABLE_ZLIB=0" ]  # Must be 0.
+    extra_values += [ "HAVE_LIBZ=0" ]  # Must be 0.
   }
 
   if (host_cpu == "x64") {

diff  --git a/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn
index 5f8058699d72..97007eecd1eb 100644
--- a/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn
@@ -86,8 +86,8 @@ write_cmake_config("lit_common_configured") {
   }
 
   if (llvm_enable_zlib) {
-    values += [ "LLVM_ENABLE_ZLIB=1" ]
+    values += [ "HAVE_LIBZ=1" ]
   } else {
-    values += [ "LLVM_ENABLE_ZLIB=0" ]
+    values += [ "HAVE_LIBZ=0" ]
   }
 }

diff  --git a/llvm/utils/gn/secondary/lld/test/BUILD.gn b/llvm/utils/gn/secondary/lld/test/BUILD.gn
index bfb63a39ba65..508225bd5e5f 100644
--- a/llvm/utils/gn/secondary/lld/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/test/BUILD.gn
@@ -49,9 +49,9 @@ write_lit_cfg("lit_site_cfg") {
   }
 
   if (llvm_enable_zlib) {
-    extra_values += [ "LLVM_ENABLE_ZLIB=1" ]
+    extra_values += [ "HAVE_LIBZ=1" ]
   } else {
-    extra_values += [ "LLVM_ENABLE_ZLIB=0" ]  # Must be 0.
+    extra_values += [ "HAVE_LIBZ=0" ]  # Must be 0.
   }
 
   if (current_cpu == "x64" || current_cpu == "arm64" ||

diff  --git a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
index c9e7c45fc118..741729ea342c 100644
--- a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
@@ -295,10 +295,20 @@ write_cmake_config("config") {
     values += [ "LLVM_ENABLE_DIA_SDK=" ]
   }
 
+  # FIXME: Once https://reviews.llvm.org/D79219 is in, remove the two
+  # redundant HAVE_ variables.
   if (llvm_enable_zlib) {
-    values += [ "LLVM_ENABLE_ZLIB=1" ]
+    values += [
+      "HAVE_LIBZ=1",
+      "HAVE_ZLIB_H=1",
+      "LLVM_ENABLE_ZLIB=1",
+    ]
   } else {
-    values += [ "LLVM_ENABLE_ZLIB=" ]
+    values += [
+      "HAVE_LIBZ=",
+      "HAVE_ZLIB_H=",
+      "LLVM_ENABLE_ZLIB=",
+    ]
   }
 
   if (llvm_enable_libxml2) {

diff  --git a/llvm/utils/gn/secondary/llvm/test/BUILD.gn b/llvm/utils/gn/secondary/llvm/test/BUILD.gn
index c714d9b5ba7b..f272bc1baacf 100644
--- a/llvm/utils/gn/secondary/llvm/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/test/BUILD.gn
@@ -174,9 +174,9 @@ write_lit_config("lit_site_cfg") {
   }
 
   if (llvm_enable_zlib) {
-    extra_values += [ "LLVM_ENABLE_ZLIB=1" ]
+    extra_values += [ "HAVE_LIBZ=1" ]
   } else {
-    extra_values += [ "LLVM_ENABLE_ZLIB=0" ]  # Must be 0.
+    extra_values += [ "HAVE_LIBZ=0" ]  # Must be 0.
   }
 }