Fix broken pipe caused by commands in toolchain.gypi.
I sometimes observe broken pipe errors when I run gyp, which causes the gyp process to fail. This seems to happen if gyp is executed under heavy I/O pressure. This change removes the pipes by replacing "echo |" with "< /dev/null". Technically these are not the same, because "echo |" prints a newline while "< /dev/null" doesn't, but this difference is not significant in the context of the commands in toolchain.gypi. BUG= R=jkummerow@chromium.org Review URL: https://codereview.chromium.org/73623002 Patch from Yuta Kitamura <yutak@chromium.org>. git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@17836 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
0ca68f712e
commit
ec9a9ac103
@ -376,7 +376,7 @@
|
||||
'target_conditions': [
|
||||
['_toolset=="host"', {
|
||||
'variables': {
|
||||
'm32flag': '<!((echo | $(echo ${CXX_host:-$(which g++)}) -m32 -E - > /dev/null 2>&1) && echo "-m32" || true)',
|
||||
'm32flag': '<!(($(echo ${CXX_host:-$(which g++)}) -m32 -E - > /dev/null 2>&1 < /dev/null) && echo "-m32" || true)',
|
||||
},
|
||||
'cflags': [ '<(m32flag)' ],
|
||||
'ldflags': [ '<(m32flag)' ],
|
||||
@ -386,7 +386,7 @@
|
||||
}],
|
||||
['_toolset=="target"', {
|
||||
'variables': {
|
||||
'm32flag': '<!((echo | $(echo ${CXX_target:-<(CXX)}) -m32 -E - > /dev/null 2>&1) && echo "-m32" || true)',
|
||||
'm32flag': '<!(($(echo ${CXX_target:-<(CXX)}) -m32 -E - > /dev/null 2>&1 < /dev/null) && echo "-m32" || true)',
|
||||
'clang%': 0,
|
||||
},
|
||||
'conditions': [
|
||||
@ -408,14 +408,14 @@
|
||||
'target_conditions': [
|
||||
['_toolset=="host"', {
|
||||
'variables': {
|
||||
'm64flag': '<!((echo | $(echo ${CXX_host:-$(which g++)}) -m64 -E - > /dev/null 2>&1) && echo "-m64" || true)',
|
||||
'm64flag': '<!(($(echo ${CXX_host:-$(which g++)}) -m64 -E - > /dev/null 2>&1 < /dev/null) && echo "-m64" || true)',
|
||||
},
|
||||
'cflags': [ '<(m64flag)' ],
|
||||
'ldflags': [ '<(m64flag)' ],
|
||||
}],
|
||||
['_toolset=="target"', {
|
||||
'variables': {
|
||||
'm64flag': '<!((echo | $(echo ${CXX_target:-<(CXX)}) -m64 -E - > /dev/null 2>&1) && echo "-m64" || true)',
|
||||
'm64flag': '<!(($(echo ${CXX_target:-<(CXX)}) -m64 -E - > /dev/null 2>&1 < /dev/null) && echo "-m64" || true)',
|
||||
},
|
||||
'cflags': [ '<(m64flag)' ],
|
||||
'ldflags': [ '<(m64flag)' ],
|
||||
|
Loading…
Reference in New Issue
Block a user