[llvm] f8e833a - [gn build] Add a flag zlib_path to provide the path to zlib on Windows.

[Nico Weber via llvm-commits]

Author: Sébastien Marchand
Date: 2020-05-19T16:00:54-04:00
New Revision: f8e833a50183ce2048e3cf5929afa672caea0df5

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

LOG: [gn build] Add a flag zlib_path to provide the path to zlib on Windows.

Also, automatically set llvm_enable_zlib to true when zlib_path is set.

Differential Revision: https://reviews.llvm.org/D80042

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/build/libs/zlib/BUILD.gn b/llvm/utils/gn/build/libs/zlib/BUILD.gn
index 5085578e760e..0ed85dc70385 100644
--- a/llvm/utils/gn/build/libs/zlib/BUILD.gn
+++ b/llvm/utils/gn/build/libs/zlib/BUILD.gn
@@ -2,7 +2,13 @@ import("//llvm/utils/gn/build/libs/zlib/enable.gni")
 
 config("zlib_config") {
   visibility = [ ":zlib" ]
-  libs = [ "z" ]
+  if (host_os == "win") {
+    assert(zlib_path != "", "Please provide the path to zlib")
+    include_dirs = [ zlib_path ]
+    libs = [ "$zlib_path/zlib.lib" ]
+  } else {
+    libs = [ "z" ]
+  }
 }
 
 group("zlib") {

diff  --git a/llvm/utils/gn/build/libs/zlib/enable.gni b/llvm/utils/gn/build/libs/zlib/enable.gni
index 9626301378bd..512bf07e1b4d 100644
--- a/llvm/utils/gn/build/libs/zlib/enable.gni
+++ b/llvm/utils/gn/build/libs/zlib/enable.gni
@@ -1,4 +1,11 @@
+declare_args() {
+  if (host_os == "win") {
+    # On Windows, path to a directory containing zlib headers and zlib.lib.
+    zlib_path = ""
+  }
+}
+
 declare_args() {
   # Whether to include code that links against zlib.
-  llvm_enable_zlib = host_os != "win"
+  llvm_enable_zlib = host_os != "win" || zlib_path != ""
 }