diff options
| author | Brett Wilson <brettw@chromium.org> | 2014-09-02 12:50:29 -0700 |
|---|---|---|
| committer | Brett Wilson <brettw@chromium.org> | 2014-09-02 19:57:57 +0000 |
| commit | e1b05dc1d206abb5cd3fc0fdd549bd88eb5452a9 (patch) | |
| tree | d284b09eece2c6ca1b44c448094e8f8db462432f | |
| parent | 83fd424ef7bcba7af879bad8cd62bf708e6f5947 (diff) | |
| download | chromium_src-e1b05dc1d206abb5cd3fc0fdd549bd88eb5452a9.zip chromium_src-e1b05dc1d206abb5cd3fc0fdd549bd88eb5452a9.tar.gz chromium_src-e1b05dc1d206abb5cd3fc0fdd549bd88eb5452a9.tar.bz2 | |
Minor fixes for the GN Windows build.
R=scottmg@chromium.org
Review URL: https://codereview.chromium.org/533853002
Cr-Commit-Position: refs/heads/master@{#292979}
| -rw-r--r-- | build/compiled_action.gni | 10 | ||||
| -rw-r--r-- | build/config/compiler/BUILD.gn | 22 | ||||
| -rw-r--r-- | components/pdf/renderer/BUILD.gn | 2 |
3 files changed, 21 insertions, 13 deletions
diff --git a/build/compiled_action.gni b/build/compiled_action.gni index 2fb4532..b750af0 100644 --- a/build/compiled_action.gni +++ b/build/compiled_action.gni @@ -66,6 +66,12 @@ # saves unnecessarily compiling your tool for the target platform. But if you # need a target build of your tool as well, just leave off the if statement. +if (build_os == "win") { + _host_executable_suffix = ".exe" +} else { + _host_executable_suffix = "" +} + template("compiled_action") { assert(defined(invoker.tool), "tool must be defined for $target_name") assert(defined(invoker.outputs), "outputs must be defined for $target_name") @@ -97,7 +103,7 @@ template("compiled_action") { # specify this, since we can't know what the output name is (it might be in # another file not processed yet). host_executable = get_label_info(host_tool, "root_out_dir") + "/" + - get_label_info(host_tool, "name") + get_label_info(host_tool, "name") + _host_executable_suffix # Add the executable itself as an input. inputs += [ host_executable ] @@ -146,7 +152,7 @@ template("compiled_action_foreach") { # specify this, since we can't know what the output name is (it might be in # another file not processed yet). host_executable = get_label_info(host_tool, "root_out_dir") + "/" + - get_label_info(host_tool, "name") + get_label_info(host_tool, "name") + _host_executable_suffix # Add the executable itself as an input. inputs += [ host_executable ] diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn index 33d52db..b04d6df 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -18,16 +18,18 @@ declare_args() { use_gold = is_linux && cpu_arch == "x64" -# linux_use_debug_fission: whether to use split DWARF debug info -# files. This can reduce link time significantly, but is incompatible -# with some utilities such as icecc and ccache. Requires gold and -# gcc >= 4.8 or clang. -# http://gcc.gnu.org/wiki/DebugFission -# -# TODO(GYP) enable this. Currently this gives errors from objcopy, presumably -# because some other symbol or toolchain setting isn't correct. -#use_debug_fission = use_gold -use_debug_fission = false +if (!is_win) { + # linux_use_debug_fission: whether to use split DWARF debug info + # files. This can reduce link time significantly, but is incompatible + # with some utilities such as icecc and ccache. Requires gold and + # gcc >= 4.8 or clang. + # http://gcc.gnu.org/wiki/DebugFission + # + # TODO(GYP) enable this. Currently this gives errors from objcopy, presumably + # because some other symbol or toolchain setting isn't correct. + #use_debug_fission = use_gold + use_debug_fission = false +} # default_include_dirs --------------------------------------------------------- # diff --git a/components/pdf/renderer/BUILD.gn b/components/pdf/renderer/BUILD.gn index 3e0fbc7..c83ea41 100644 --- a/components/pdf/renderer/BUILD.gn +++ b/components/pdf/renderer/BUILD.gn @@ -27,7 +27,7 @@ static_library("renderer") { ] if (is_win) { - cflags += [ + cflags = [ "/wd4267" # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. ] } |