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

Nico Weber via llvm-commits llvm-commits at lists.llvm.org
Tue May 19 13:14:14 PDT 2020


Author: Nico Weber
Date: 2020-05-19T16:14:04-04:00
New Revision: f8cccd126b4780a42c00ba84848a66a1c8567183

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

LOG: [gn build] Try 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 0ed85dc70385..9022572adae4 100644
--- a/llvm/utils/gn/build/libs/zlib/BUILD.gn
+++ b/llvm/utils/gn/build/libs/zlib/BUILD.gn
@@ -3,7 +3,8 @@ import("//llvm/utils/gn/build/libs/zlib/enable.gni")
 config("zlib_config") {
   visibility = [ ":zlib" ]
   if (host_os == "win") {
-    assert(zlib_path != "", "Please provide the path to zlib")
+    assert(!llvm_enable_zlib || zlib_path != "",
+           "Please provide the path to zlib.")
     include_dirs = [ zlib_path ]
     libs = [ "$zlib_path/zlib.lib" ]
   } else {


        


More information about the llvm-commits mailing list