diff options
| -rw-r--r-- | llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn | 8 | ||||
| -rw-r--r-- | llvm/utils/gn/secondary/llvm/lib/DebugInfo/PDB/BUILD.gn | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn index 3b78c39075d..34be74c7ce5 100644 --- a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn @@ -1,4 +1,5 @@ import("//llvm/lib/Target/targets.gni") +import("//llvm/lib/DebugInfo/PDB/enable_dia.gni") import("//llvm/triples.gni") import("//llvm/utils/gn/build/buildflags.gni") import("//llvm/utils/gn/build/libs/edit/enable.gni") @@ -77,7 +78,6 @@ write_cmake_config("config") { "HAVE_CRASHREPORTERCLIENT_H=", "HAVE_DECL_FE_ALL_EXCEPT=1", "HAVE_DECL_FE_INEXACT=1", - "LLVM_ENABLE_DIA_SDK=", "LLVM_ENABLE_CRASH_DUMPS=", "HAVE_ERRNO_H=1", "HAVE_FCNTL_H=1", @@ -297,6 +297,12 @@ write_cmake_config("config") { values += [ "HAVE_TERMINFO=" ] } + if (llvm_enable_dia_sdk) { + values += [ "LLVM_ENABLE_DIA_SDK=1" ] + } else { + values += [ "LLVM_ENABLE_DIA_SDK=" ] + } + if (llvm_enable_zlib) { values += [ "LLVM_ENABLE_ZLIB=1" ] } else { diff --git a/llvm/utils/gn/secondary/llvm/lib/DebugInfo/PDB/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/DebugInfo/PDB/BUILD.gn index 63057681ad0..59fe339fe95 100644 --- a/llvm/utils/gn/secondary/llvm/lib/DebugInfo/PDB/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/lib/DebugInfo/PDB/BUILD.gn @@ -113,6 +113,6 @@ static_library("PDB") { "DIA/DIASourceFile.cpp", "DIA/DIATable.cpp", ] - # FIXME: Link against the right diaguids.lib too. + libs = [ "diaguids.lib" ] } } |
