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: http://src.chromium.org/svn/trunk/src/build@282077 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
28303e4e48
Коммит
427561eb3d
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
Загрузка…
Ссылка в новой задаче