OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[llvm][Debuginfod][Bazel] Match dependencies in CMakeLists.txt. 

Also update llvm-config.h and llvm-config.h.cmake to match 484b1aa611

Differential Revision: https://reviews.llvm.org/D129252
This commit is contained in:
Adrian Kuegel 2022-07-07 08:31:43 +02:00
parent 40a4078e14
commit f066a0cd21
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
View File

@ -195,7 +195,7 @@ cc_library(
"lib/Support/BLAKE3/blake3_avx512_x86-64_unix.S", "lib/Support/BLAKE3/blake3_avx512_x86-64_unix.S",
], ],
"//conditions:default": [ "//conditions:default": [
] ],
}), }),
hdrs = glob([ hdrs = glob([
"include/llvm/Support/**/*.h", "include/llvm/Support/**/*.h",
@ -221,7 +221,7 @@ cc_library(
], ],
"//conditions:default": [ "//conditions:default": [
"BLAKE3_USE_NEON=0", "BLAKE3_USE_NEON=0",
] ],
}) + select({ }) + select({
"@platforms//cpu:x86_64": [ "@platforms//cpu:x86_64": [
], ],
@ -230,7 +230,7 @@ cc_library(
"BLAKE3_NO_AVX512", "BLAKE3_NO_AVX512",
"BLAKE3_NO_SSE2", "BLAKE3_NO_SSE2",
"BLAKE3_NO_SSE41", "BLAKE3_NO_SSE41",
] ],
}), }),
includes = ["include"], includes = ["include"],
linkopts = select({ linkopts = select({
@ -435,6 +435,9 @@ cc_library(
]), ]),
copts = llvm_copts, copts = llvm_copts,
deps = [ deps = [
":BinaryFormat",
":DebugInfoDWARF",
":Object",
":Support", ":Support",
":Symbolize", ":Symbolize",
], ],
@ -2594,7 +2597,7 @@ template_rule(
src = "cmake/modules/llvm-driver-template.cpp.in", src = "cmake/modules/llvm-driver-template.cpp.in",
out = "dsymutil-driver.cpp", out = "dsymutil-driver.cpp",
substitutions = { substitutions = {
"@TOOL_NAME@": "dsymutil" "@TOOL_NAME@": "dsymutil",
}, },
) )
@ -2698,7 +2701,7 @@ template_rule(
src = "cmake/modules/llvm-driver-template.cpp.in", src = "cmake/modules/llvm-driver-template.cpp.in",
out = "llvm-ar-driver.cpp", out = "llvm-ar-driver.cpp",
substitutions = { substitutions = {
"@TOOL_NAME@": "llvm_ar" "@TOOL_NAME@": "llvm_ar",
}, },
) )
@ -2900,7 +2903,7 @@ template_rule(
src = "cmake/modules/llvm-driver-template.cpp.in", src = "cmake/modules/llvm-driver-template.cpp.in",
out = "llvm-cxxfilt-driver.cpp", out = "llvm-cxxfilt-driver.cpp",
substitutions = { substitutions = {
"@TOOL_NAME@": "llvm_cxxfilt" "@TOOL_NAME@": "llvm_cxxfilt",
}, },
) )
@ -2929,11 +2932,11 @@ cc_binary(
copts = llvm_copts, copts = llvm_copts,
stamp = 0, stamp = 0,
deps = [ deps = [
":Symbolize",
":BitReader", ":BitReader",
":Core", ":Core",
":Support",
":Debuginfod", ":Debuginfod",
":Support",
":Symbolize",
], ],
) )
@ -3443,11 +3446,10 @@ template_rule(
src = "cmake/modules/llvm-driver-template.cpp.in", src = "cmake/modules/llvm-driver-template.cpp.in",
out = "llvm-objcopy-driver.cpp", out = "llvm-objcopy-driver.cpp",
substitutions = { substitutions = {
"@TOOL_NAME@": "llvm_objcopy" "@TOOL_NAME@": "llvm_objcopy",
}, },
) )
cc_binary( cc_binary(
name = "llvm-objcopy", name = "llvm-objcopy",
srcs = glob([ srcs = glob([

3
utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h
View File

@ -96,6 +96,9 @@
/* Define if we have curl and want to use it */ /* Define if we have curl and want to use it */
/* #undef LLVM_ENABLE_CURL */ /* #undef LLVM_ENABLE_CURL */
/* Define if we have cpp-httplib and want to use it */
/* #undef LLVM_ENABLE_HTTPLIB */
/* Define if LLVM was built with a dependency to the libtensorflow dynamic library */ /* Define if LLVM was built with a dependency to the libtensorflow dynamic library */
/* #undef LLVM_HAVE_TF_API */ /* #undef LLVM_HAVE_TF_API */

3
utils/bazel/llvm_configs/llvm-config.h.cmake
View File

@ -89,6 +89,9 @@
/* Define if we have curl and want to use it */ /* Define if we have curl and want to use it */
#cmakedefine LLVM_ENABLE_CURL ${LLVM_ENABLE_CURL} #cmakedefine LLVM_ENABLE_CURL ${LLVM_ENABLE_CURL}
/* Define if we have cpp-httplib and want to use it */
#cmakedefine LLVM_ENABLE_HTTPLIB ${LLVM_ENABLE_HTTPLIB}
/* Define if zlib compression is available */ /* Define if zlib compression is available */
#cmakedefine01 LLVM_ENABLE_ZLIB #cmakedefine01 LLVM_ENABLE_ZLIB