| Index: build/toolchain.gypi
|
| diff --git a/build/toolchain.gypi b/build/toolchain.gypi
|
| index de41fe0d00189e2a20576c63004e21a6ad14a9d8..99f357a965a743863ce6c53bb77f8e137d6f8582 100644
|
| --- a/build/toolchain.gypi
|
| +++ b/build/toolchain.gypi
|
| @@ -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)' ],
|
|
|