[llvm] 1502941 - [gn build] Try harder to unbreak Windows build after f8e833a501.

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2020-05-19T17:14:08-04:00
New Revision: 1502941c1c025fc5cdef63a1f6e54a68c2cf49d6

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

LOG: [gn build] Try harder to unbreak Windows build after f8e833a501.

Added: 
    

Modified: 
    llvm/utils/gn/build/libs/zlib/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/build/libs/zlib/BUILD.gn b/llvm/utils/gn/build/libs/zlib/BUILD.gn
index 9022572adae4..f9064490eae3 100644
--- a/llvm/utils/gn/build/libs/zlib/BUILD.gn
+++ b/llvm/utils/gn/build/libs/zlib/BUILD.gn
@@ -2,9 +2,7 @@ import("//llvm/utils/gn/build/libs/zlib/enable.gni")
 
 config("zlib_config") {
   visibility = [ ":zlib" ]
-  if (host_os == "win") {
-    assert(!llvm_enable_zlib || zlib_path != "",
-           "Please provide the path to zlib.")
+  if (host_os == "win" && zlib_path != "") {
     include_dirs = [ zlib_path ]
     libs = [ "$zlib_path/zlib.lib" ]
   } else {
@@ -14,6 +12,8 @@ config("zlib_config") {
 
 group("zlib") {
   if (llvm_enable_zlib) {
+    assert(host_os != "win" || zlib_path != "",
+           "Please set zlib_path on Windows.")
     public_configs = [ ":zlib_config" ]
   }
 }