[PATCH] D57994: Partially revert "gn build: Merge r353471, r353373."
Mirko Bonadei via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Sat Feb 9 01:55:35 PST 2019
mbonadei created this revision.
mbonadei added a reviewer: thakis.
Herald added subscribers: llvm-commits, kristina, hiraditya.
Herald added a project: LLVM.
gn build: Merge r353590
Repository:
rL LLVM
https://reviews.llvm.org/D57994
Files:
llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn
llvm/utils/gn/secondary/clang/lib/StaticAnalyzer/Core/BUILD.gn
llvm/utils/gn/secondary/clang/test/BUILD.gn
llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
llvm/utils/gn/secondary/llvm/lib/Support/BUILD.gn
Index: llvm/utils/gn/secondary/llvm/lib/Support/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/llvm/lib/Support/BUILD.gn
+++ llvm/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" ]
}
Index: llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
+++ llvm/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.
Index: llvm/utils/gn/secondary/clang/test/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/clang/test/BUILD.gn
+++ llvm/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"),
Index: llvm/utils/gn/secondary/clang/lib/StaticAnalyzer/Core/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/clang/lib/StaticAnalyzer/Core/BUILD.gn
+++ llvm/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.
}
Index: llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn
+++ llvm/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=",
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D57994.186099.patch
Type: text/x-patch
Size: 2988 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190209/f0146754/attachment.bin>
More information about the llvm-commits
mailing list