diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-09 17:30:37 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-09 17:30:37 +0000 |
commit | 11a1bb63d35e9beaa8f7a0acf51bc0d8a1c865cb (patch) | |
tree | f202fff3faa441dd67aff8dea2a7351f80033cc6 /build/toolchain | |
parent | a901cc9a31b96f16796290262cf248abb6432980 (diff) | |
download | chromium_src-11a1bb63d35e9beaa8f7a0acf51bc0d8a1c865cb.zip chromium_src-11a1bb63d35e9beaa8f7a0acf51bc0d8a1c865cb.tar.gz chromium_src-11a1bb63d35e9beaa8f7a0acf51bc0d8a1c865cb.tar.bz2 |
Replace deps with depsformat in GN tool defs
This variable changed name to avoid ambiguity with dependencies.
R=noelallen@chromium.org
Review URL: https://codereview.chromium.org/374213002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282077 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/toolchain')
-rw-r--r-- | build/toolchain/gcc_toolchain.gni | 4 | ||||
-rw-r--r-- | build/toolchain/mac/BUILD.gn | 8 | ||||
-rw-r--r-- | build/toolchain/nacl/BUILD.gn | 4 | ||||
-rw-r--r-- | build/toolchain/win/BUILD.gn | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni index 9ad47a4..a6d4728 100644 --- a/build/toolchain/gcc_toolchain.gni +++ b/build/toolchain/gcc_toolchain.gni @@ -64,14 +64,14 @@ template("gcc_toolchain") { command = "$cc -MMD -MF \$out.d \$defines \$includes \$cflags \$cflags_c -c \$in -o \$out" description = "CC \$out" depfile = "\$out.d" - deps = "gcc" + depsformat = "gcc" } tool("cxx") { # cflags_pch_cc command = "$cxx -MMD -MF \$out.d \$defines \$includes \$cflags \$cflags_cc -c \$in -o \$out" description = "CXX \$out" depfile = "\$out.d" - deps = "gcc" + depsformat = "gcc" } tool("alink") { command = "rm -f \$out && $ar rcs \$out @\$rspfile" diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn index e95e540..ba3f48c 100644 --- a/build/toolchain/mac/BUILD.gn +++ b/build/toolchain/mac/BUILD.gn @@ -59,25 +59,25 @@ template("mac_clang_toolchain") { command = "$cc -MMD -MF \$out.d \$defines \$includes \$cflags \$cflags_c \$cflags_pch_c -c \$in -o \$out" description = "CC \$out" depfile = "\$out.d" - deps = "gcc" + depsformat = "gcc" } tool("cxx") { command = "$cxx -MMD -MF \$out.d \$defines \$includes \$cflags \$cflags_cc \$cflags_pch_cc -c \$in -o \$out" description = "CXX \$out" depfile = "\$out.d" - deps = "gcc" + depsformat = "gcc" } tool("objc") { command = "$cc -MMD -MF \$out.d \$defines \$includes \$cflags \$cflags_c \$cflags_objc \$cflags_pch_objc -c \$in -o \$out" description = "OBJC \$out" depfile = "\$out.d" - deps = "gcc" + depsformat = "gcc" } tool("objcxx") { command = "$cxx -MMD -MF \$out.d \$defines \$includes \$cflags \$cflags_cc \$cflags_objcc \$cflags_pch_objcc -c \$in -o \$out" description = "OBJCXX \$out" depfile = "\$out.d" - deps = "gcc" + depsformat = "gcc" } tool("alink") { command = "rm -f \$out && ./gyp-mac-tool filter-libtool libtool \$libtool_flags -static -o \$out \$in \$postbuilds" diff --git a/build/toolchain/nacl/BUILD.gn b/build/toolchain/nacl/BUILD.gn index 362e9124..8c76f5a 100644 --- a/build/toolchain/nacl/BUILD.gn +++ b/build/toolchain/nacl/BUILD.gn @@ -12,14 +12,14 @@ toolchain("x86_newlib") { command = "$cc -MMD -MF \$out.d \$defines \$includes \$cflags \$cflags_c -c \$in -o \$out" description = "CC(NaCl x86 Newlib) \$out" depfile = "\$out.d" - deps = "gcc" + depsformat = "gcc" } tool("cxx") { # cflags_pch_cc command = "$cxx -MMD -MF \$out.d \$defines \$includes \$cflags \$cflags_cc -c \$in -o \$out" description = "CXX(NaCl x86 Newlib) \$out" depfile = "\$out.d" - deps = "gcc" + depsformat = "gcc" } tool("alink") { command = "rm -f \$out && ${toolprefix}ar rcs \$out \$in" diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn index 11ff2f2..3f0d0d7 100644 --- a/build/toolchain/win/BUILD.gn +++ b/build/toolchain/win/BUILD.gn @@ -35,14 +35,14 @@ toolchain("32") { description = "CC \$out" rspfile = "\$out.rsp" rspfile_content = "\$defines \$includes \$cflags \$cflags_c" - deps = "msvc" + depsformat = "msvc" } tool("cxx") { command = cc_command # Same as above description = "CXX \$out" rspfile = "\$out.rsp" rspfile_content = "\$defines \$includes \$cflags \$cflags_cc" - deps = "msvc" + depsformat = "msvc" } tool("rc") { command = "$python_path gyp-win-tool rc-wrapper environment.x86 rc.exe \$defines \$includes \$rcflags /fo\$out \$in" @@ -94,14 +94,14 @@ toolchain("64") { description = "CC \$out" rspfile = "\$out.rsp" rspfile_content = "\$defines \$includes \$cflags \$cflags_c" - deps = "msvc" + depsformat = "msvc" } tool("cxx") { command = cc_command # Same as above description = "CXX \$out" rspfile = "\$out.rsp" rspfile_content = "\$defines \$includes \$cflags \$cflags_cc" - deps = "msvc" + depsformat = "msvc" } tool("rc") { command = "$python_path gyp-win-tool rc-wrapper environment.x64 rc.exe \$defines \$includes \$rcflags /fo\$out \$in" |