maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "Reland "[gn build] (manually) merge 68a235d07f9e70"" 

This reverts commit 94d4ca9004.

I reverted 68a235d07f again in
916be8fd6a.
This commit is contained in:
Hans Wennborg 2020-03-03 11:21:11 +01:00
parent 4deea65249
commit 93c73d4834
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/utils/gn/secondary/clang/test/BUILD.gn
View File

@ -75,9 +75,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") {

4
llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn
View File

@ -85,8 +85,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" ]
}
}

4
llvm/utils/gn/secondary/lld/test/BUILD.gn
View File

@ -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" ||

4
llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
View File

@ -206,6 +206,7 @@ write_cmake_config("config") {
"HAVE_ISATTY=",
"HAVE_LIBPTHREAD=",
"HAVE_PTHREAD_SETNAME_NP=",
"HAVE_LIBZ=",
"HAVE_PREAD=",
"HAVE_PTHREAD_GETSPECIFIC=",
"HAVE_PTHREAD_H=",
@ -224,6 +225,7 @@ write_cmake_config("config") {
"HAVE_SYS_TIME_H=",
"HAVE_TERMIOS_H=",
"HAVE_UNISTD_H=",
"HAVE_ZLIB_H=",
"HAVE__CHSIZE_S=1",
"HAVE__UNWIND_BACKTRACE=",
"stricmp=_stricmp",
@ -242,6 +244,7 @@ write_cmake_config("config") {
"HAVE_ISATTY=1",
"HAVE_LIBPTHREAD=1",
"HAVE_PTHREAD_SETNAME_NP=1",
"HAVE_LIBZ=1",
"HAVE_PREAD=1",
"HAVE_PTHREAD_GETSPECIFIC=1",
"HAVE_PTHREAD_H=1",
@ -260,6 +263,7 @@ write_cmake_config("config") {
"HAVE_SYS_TIME_H=1",
"HAVE_TERMIOS_H=1",
"HAVE_UNISTD_H=1",
"HAVE_ZLIB_H=1",
"HAVE__CHSIZE_S=",
"HAVE__UNWIND_BACKTRACE=1",
"stricmp=",

4
llvm/utils/gn/secondary/llvm/test/BUILD.gn
View File

@ -166,9 +166,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.
}
}