Index: courgette/BUILD.gn |
diff --git a/courgette/BUILD.gn b/courgette/BUILD.gn |
index 5693b9a899cc4d3f3d8bb361b8cbe7a74d7f3913..371085447ca59779c3b832eb304ad6424405cd82 100644 |
--- a/courgette/BUILD.gn |
+++ b/courgette/BUILD.gn |
@@ -109,20 +109,36 @@ if (!is_ios) { |
] |
} |
- # The official build scripts expect courgette.exe to be in the official build |
- # archives but it's not clear if they really need it, copy courgette64.exe to |
- # courgette.exe to work around this. https://crbug.com/629243 |
- if (is_win && current_cpu == "x64") { |
- copy("copy_courgette64_to_courgette") { |
- sources = [ |
- "$root_out_dir/courgette64.exe", |
- ] |
- outputs = [ |
- "$root_out_dir/courgette.exe", |
- ] |
- deps = [ |
- ":courgette", |
- ] |
+ if (is_win) { |
+ if (current_cpu == "x64") { |
+ # TODO(sebmarchand): The official build scripts expect courgette.exe to be |
+ # in the official build archives, remove this once they have been updated. |
+ # https://crbug.com/629243 |
+ copy("copy_courgette_binaries") { |
+ sources = [ |
+ "$root_out_dir/courgette64.exe", |
+ ] |
+ outputs = [ |
+ "$root_out_dir/courgette.exe", |
+ ] |
+ deps = [ |
+ ":courgette", |
+ ] |
+ } |
+ } else { |
+ # Make sure that we have a copy of courgette64.exe in the root out |
+ # directory. |
+ copy("copy_courgette_binaries") { |
+ sources = [ |
+ "$root_out_dir/x64/courgette64.exe", |
Will Harris
2016/07/20 22:23:30
where is this file emitted from?
Dirk Pranke
2016/07/20 22:37:41
The :courgette(//build/toolchain/win:x64) dependen
|
+ ] |
+ outputs = [ |
+ "$root_out_dir/courgette64.exe", |
+ ] |
+ deps = [ |
+ ":courgette(//build/toolchain/win:x64)", |
+ ] |
+ } |
} |
} |
} |