Skip to content

Commit 7b05655

Browse files
nicogithub-actions[bot]
authored andcommitted
Automerge: [gn] Fix missing dependency (#204991)
This fixes an oversight in 27d344d.
2 parents 72726ca + d6d4921 commit 7b05655

2 files changed

Lines changed: 11 additions & 5 deletions

File tree

llvm/utils/gn/build/write_cmake_config.gni

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
# Parameters:
77
#
88
# input (required) [string]
9+
10+
# extra_inputs (optional) [list of string]
911
#
1012
# output (required) [string]
1113
#
@@ -31,6 +33,11 @@ template("write_cmake_config") {
3133
script = "//llvm/utils/gn/build/write_cmake_config.py"
3234

3335
sources = [ invoker.input ]
36+
37+
if (defined(invoker.extra_inputs)) {
38+
sources += invoker.extra_inputs
39+
}
40+
3441
outputs = [ invoker.output ]
3542
args = [
3643
"-o",

llvm/utils/gn/secondary/llvm/lib/Transforms/IPO/BUILD.gn

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@ import("//llvm/utils/gn/build/write_cmake_config.gni")
22

33
write_cmake_config("write_instrumentor_variables") {
44
input = "//llvm/include/llvm/Transforms/IPO/InstrumentorVariables.inc.in"
5+
extra_inputs =
6+
[ "//llvm/include/llvm/Transforms/IPO/InstrumentorRuntimeHelper.h" ]
57
output =
68
"$root_gen_dir/llvm/include/llvm/Transforms/IPO/InstrumentorVariables.inc"
7-
values =
8-
[ "LLVM_INSTRUMENTOR_RUNTIME_HELPER=@file:" +
9-
rebase_path(
10-
"//llvm/include/llvm/Transforms/IPO/InstrumentorRuntimeHelper.h",
11-
root_build_dir) ]
9+
values = [ "LLVM_INSTRUMENTOR_RUNTIME_HELPER=@file:" +
10+
rebase_path(extra_inputs[0], root_build_dir) ]
1211
}
1312

1413
static_library("IPO") {

0 commit comments

Comments
 (0)