[gn build] (manually) port 10b1b4a23

This commit is contained in:
Nico Weber 2020-07-24 08:37:47 -04:00
parent 6371a0a00e
commit 2ad56119f5
4 changed files with 8 additions and 18 deletions

View File

@ -79,9 +79,9 @@ write_lit_config("lit_site_cfg") {
}
if (llvm_enable_zlib) {
extra_values += [ "HAVE_LIBZ=1" ]
extra_values += [ "LLVM_ENABLE_ZLIB=1" ]
} else {
extra_values += [ "HAVE_LIBZ=0" ] # Must be 0.
extra_values += [ "LLVM_ENABLE_ZLIB=0" ] # Must be 0.
}
if (host_cpu == "x64") {

View File

@ -49,9 +49,9 @@ write_lit_cfg("lit_site_cfg") {
}
if (llvm_enable_zlib) {
extra_values += [ "HAVE_LIBZ=1" ]
extra_values += [ "LLVM_ENABLE_ZLIB=1" ]
} else {
extra_values += [ "HAVE_LIBZ=0" ] # Must be 0.
extra_values += [ "LLVM_ENABLE_ZLIB=0" ] # Must be 0.
}
if (current_cpu == "x64" || current_cpu == "arm64" ||

View File

@ -295,20 +295,10 @@ 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 += [
"HAVE_LIBZ=1",
"HAVE_ZLIB_H=1",
"LLVM_ENABLE_ZLIB=1",
]
values += [ "LLVM_ENABLE_ZLIB=1" ]
} else {
values += [
"HAVE_LIBZ=",
"HAVE_ZLIB_H=",
"LLVM_ENABLE_ZLIB=",
]
values += [ "LLVM_ENABLE_ZLIB=" ]
}
if (llvm_enable_libxml2) {

View File

@ -174,9 +174,9 @@ write_lit_config("lit_site_cfg") {
}
if (llvm_enable_zlib) {
extra_values += [ "HAVE_LIBZ=1" ]
extra_values += [ "LLVM_ENABLE_ZLIB=1" ]
} else {
extra_values += [ "HAVE_LIBZ=0" ] # Must be 0.
extra_values += [ "LLVM_ENABLE_ZLIB=0" ] # Must be 0.
}
}