Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(469)

Unified Diff: third_party/yasm/BUILD.gn

Issue 505403002: Fix compiled action dependencies in GN. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix module.c compilation Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/compiled_action.gni ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/yasm/BUILD.gn
diff --git a/third_party/yasm/BUILD.gn b/third_party/yasm/BUILD.gn
index 812be9a6c43ac48408218e101066723842adc5ce..9429bc0cfde839b65e35e59bcab5c4868a8806a9 100644
--- a/third_party/yasm/BUILD.gn
+++ b/third_party/yasm/BUILD.gn
@@ -292,12 +292,12 @@ if (current_toolchain == host_toolchain) {
compiled_action(target_name) {
tool = ":genmacro"
# Output #included by source/patched-yasm/frontends/yasm/yasm.c.
- sources = invoker.sources
+ inputs = invoker.sources
outputs = invoker.outputs
args = [
rebase_path(outputs[0], root_build_dir),
invoker.macro_varname,
- rebase_path(sources[0], root_build_dir),
+ rebase_path(inputs[0], root_build_dir),
]
if (defined(invoker.deps)) {
deps = invoker.deps
@@ -354,35 +354,37 @@ if (current_toolchain == host_toolchain) {
# This call doesn't fit into the re2c template above.
compiled_action("compile_re2c_lc3b") {
tool = ":re2c"
- sources = [ "source/patched-yasm/modules/arch/lc3b/lc3bid.re" ]
+ inputs = [ "source/patched-yasm/modules/arch/lc3b/lc3bid.re" ]
outputs = [ "$target_gen_dir/lc3bid.c" ]
args = [
"-s",
"-o",
rebase_path(outputs[0], root_build_dir),
- rebase_path(sources[0], root_build_dir),
+ rebase_path(inputs[0], root_build_dir),
]
}
compiled_action("generate_license") {
tool = ":genstring"
# Output #included by source/patched-yasm/frontends/yasm/yasm.c.
- sources = [ "source/patched-yasm/COPYING" ]
+ inputs = [ "source/patched-yasm/COPYING" ]
outputs = [ "$yasm_gen_include_dir/license.c" ]
args = [
"license_msg",
rebase_path(outputs[0], root_build_dir),
- rebase_path(sources[0], root_build_dir),
+ rebase_path(inputs[0], root_build_dir),
]
}
compiled_action("generate_module") {
tool = ":genmodule"
- inputs = [ config_makefile ]
- sources = [ "source/patched-yasm/libyasm/module.in" ]
+ inputs = [
+ "source/patched-yasm/libyasm/module.in",
+ config_makefile,
+ ]
outputs = [ "$target_gen_dir/module.c" ]
args = [
- rebase_path(sources[0], root_build_dir),
+ rebase_path(inputs[0], root_build_dir),
rebase_path(config_makefile, root_build_dir),
rebase_path(outputs[0], root_build_dir),
]
« no previous file with comments | « build/compiled_action.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698