Commit db366f91 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

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

This reverts commit 94d4ca90.

I reverted 68a235d0 again in
916be8fd.

(cherry picked from commit 93c73d48)
parent 5f9211bc

llvm/utils/gn/secondary/clang/test/BUILD.gn

+2 −2
Original line number Diff line number Diff line
@@ -74,9 +74,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") {

llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn

+2 −2
Original line number Diff line number Diff line
@@ -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" ]

  }

}

llvm/utils/gn/secondary/lld/test/BUILD.gn

+2 −2
Original line number Diff line number Diff line
@@ -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" ||

llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn

+4 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ write_cmake_config("config") { 
      "HAVE_ISATTY=",

      "HAVE_LIBPTHREAD=",

      "HAVE_PTHREAD_SETNAME_NP=",

      "HAVE_LIBZ=",

      "HAVE_PREAD=",

      "HAVE_PTHREAD_GETSPECIFIC=",

      "HAVE_PTHREAD_H=",
@@ -226,6 +227,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",
@@ -244,6 +246,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",
@@ -262,6 +265,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=",

llvm/utils/gn/secondary/llvm/test/BUILD.gn

+2 −2
Original line number Diff line number Diff line
@@ -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.

  }

}