gn build: Make setting llvm_enable_dia_sdk=true work
If this is set, %INCLUDE% must contain ".../DIA SDK/include"
and %LIB% must contain ".../DIA SKD/lib/amd64" (assuming you're doing a
64-bit build).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@359195 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn b/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
index 3b78c39..34be74c 100644
--- a/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
+++ b/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 @@
"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 @@
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/utils/gn/secondary/llvm/lib/DebugInfo/PDB/BUILD.gn b/utils/gn/secondary/llvm/lib/DebugInfo/PDB/BUILD.gn
index 6305768..59fe339 100644
--- a/utils/gn/secondary/llvm/lib/DebugInfo/PDB/BUILD.gn
+++ b/utils/gn/secondary/llvm/lib/DebugInfo/PDB/BUILD.gn
@@ -113,6 +113,6 @@
"DIA/DIASourceFile.cpp",
"DIA/DIATable.cpp",
]
- # FIXME: Link against the right diaguids.lib too.
+ libs = [ "diaguids.lib" ]
}
}
