gn build: Merge r353590
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@353621 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/utils/gn/secondary/clang/include/clang/Config/BUILD.gn b/utils/gn/secondary/clang/include/clang/Config/BUILD.gn
index 5390832..a3c0d5a 100644
--- a/utils/gn/secondary/clang/include/clang/Config/BUILD.gn
+++ b/utils/gn/secondary/clang/include/clang/Config/BUILD.gn
@@ -29,6 +29,7 @@
"CLANG_CONFIG_FILE_USER_DIR=",
"DEFAULT_SYSROOT=",
"GCC_INSTALL_PREFIX=",
+ "CLANG_ANALYZER_WITH_Z3=",
"BACKEND_PACKAGE_STRING=LLVM ${llvm_version}svn",
"ENABLE_LINKER_BUILD_ID=",
"ENABLE_X86_RELAX_RELOCATIONS=",
diff --git a/utils/gn/secondary/clang/lib/StaticAnalyzer/Core/BUILD.gn b/utils/gn/secondary/clang/lib/StaticAnalyzer/Core/BUILD.gn
index a9dd15c..745bc23 100644
--- a/utils/gn/secondary/clang/lib/StaticAnalyzer/Core/BUILD.gn
+++ b/utils/gn/secondary/clang/lib/StaticAnalyzer/Core/BUILD.gn
@@ -48,7 +48,6 @@
"RangeConstraintManager.cpp",
"RangedConstraintManager.cpp",
"RegionStore.cpp",
- "SMTConstraintManager.cpp",
"SValBuilder.cpp",
"SVals.cpp",
"SarifDiagnostics.cpp",
@@ -59,5 +58,9 @@
"SymbolManager.cpp",
"TaintManager.cpp",
"WorkList.cpp",
+ "Z3ConstraintManager.cpp",
]
+
+ # FIXME: clang/Config/BUILD.gn currently always sets CLANG_ANALYZER_WITH_Z3
+ # to false. If that changes we need to link to Z3 libs here.
}
diff --git a/utils/gn/secondary/clang/test/BUILD.gn b/utils/gn/secondary/clang/test/BUILD.gn
index bdaa97b..681b07c 100644
--- a/utils/gn/secondary/clang/test/BUILD.gn
+++ b/utils/gn/secondary/clang/test/BUILD.gn
@@ -39,7 +39,7 @@
output = clang_lit_site_cfg_file
extra_values = [
- "LLVM_WITH_Z3=", # Must be empty, not 0.
+ "CLANG_ANALYZER_WITH_Z3=", # Must be empty, not 0.
"CLANG_BUILD_EXAMPLES=0",
"CLANG_DEFAULT_CXX_STDLIB=", # Empty string means "default value" here.
"CLANG_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
diff --git a/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn b/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
index 820f631..4d0a3a8 100644
--- a/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
+++ b/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
@@ -124,7 +124,6 @@
"RETSIGTYPE=void",
"LLVM_GISEL_COV_ENABLED=",
"LLVM_GISEL_COV_PREFIX=",
- "LLVM_WITH_Z3=",
# This is both in llvm-config.h and config.h; llvm-config.h doesn't
# define it if it's not set while config.h defines it to empty in that case.
diff --git a/utils/gn/secondary/llvm/lib/Support/BUILD.gn b/utils/gn/secondary/llvm/lib/Support/BUILD.gn
index ab5f336..9a5fbd9 100644
--- a/utils/gn/secondary/llvm/lib/Support/BUILD.gn
+++ b/utils/gn/secondary/llvm/lib/Support/BUILD.gn
@@ -152,14 +152,10 @@
"Valgrind.cpp",
"VirtualFileSystem.cpp",
"Watchdog.cpp",
- "Z3Solver.cpp",
]
libs = []
- # FIXME: llvm/Config/BUILD.gn currently always sets LLVM_WITH_Z3
- # to false. If that changes we need to link to Z3 libs here.
-
if (current_os == "linux" || current_os == "android") {
libs += [ "dl" ]
}
