Commit e1b05dc1 authored by Brett Wilson's avatar Brett Wilson

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}
parent 83fd424e
...@@ -66,6 +66,12 @@ ...@@ -66,6 +66,12 @@
# saves unnecessarily compiling your tool for the target platform. But if you # 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. # 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") { template("compiled_action") {
assert(defined(invoker.tool), "tool must be defined for $target_name") assert(defined(invoker.tool), "tool must be defined for $target_name")
assert(defined(invoker.outputs), "outputs must be defined for $target_name") assert(defined(invoker.outputs), "outputs must be defined for $target_name")
...@@ -97,7 +103,7 @@ template("compiled_action") { ...@@ -97,7 +103,7 @@ template("compiled_action") {
# specify this, since we can't know what the output name is (it might be in # specify this, since we can't know what the output name is (it might be in
# another file not processed yet). # another file not processed yet).
host_executable = get_label_info(host_tool, "root_out_dir") + "/" + 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. # Add the executable itself as an input.
inputs += [ host_executable ] inputs += [ host_executable ]
...@@ -146,7 +152,7 @@ template("compiled_action_foreach") { ...@@ -146,7 +152,7 @@ template("compiled_action_foreach") {
# specify this, since we can't know what the output name is (it might be in # specify this, since we can't know what the output name is (it might be in
# another file not processed yet). # another file not processed yet).
host_executable = get_label_info(host_tool, "root_out_dir") + "/" + 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. # Add the executable itself as an input.
inputs += [ host_executable ] inputs += [ host_executable ]
......
...@@ -18,16 +18,18 @@ declare_args() { ...@@ -18,16 +18,18 @@ declare_args() {
use_gold = is_linux && cpu_arch == "x64" use_gold = is_linux && cpu_arch == "x64"
# linux_use_debug_fission: whether to use split DWARF debug info if (!is_win) {
# files. This can reduce link time significantly, but is incompatible # linux_use_debug_fission: whether to use split DWARF debug info
# with some utilities such as icecc and ccache. Requires gold and # files. This can reduce link time significantly, but is incompatible
# gcc >= 4.8 or clang. # with some utilities such as icecc and ccache. Requires gold and
# http://gcc.gnu.org/wiki/DebugFission # 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. # TODO(GYP) enable this. Currently this gives errors from objcopy, presumably
#use_debug_fission = use_gold # because some other symbol or toolchain setting isn't correct.
use_debug_fission = false #use_debug_fission = use_gold
use_debug_fission = false
}
# default_include_dirs --------------------------------------------------------- # default_include_dirs ---------------------------------------------------------
# #
......
...@@ -27,7 +27,7 @@ static_library("renderer") { ...@@ -27,7 +27,7 @@ static_library("renderer") {
] ]
if (is_win) { if (is_win) {
cflags += [ cflags = [
"/wd4267" # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. "/wd4267" # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
] ]
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment