| Index: build/toolchain/nacl/BUILD.gn
|
| diff --git a/build/toolchain/nacl/BUILD.gn b/build/toolchain/nacl/BUILD.gn
|
| index bea30e0de313e608acb1cf635e89648c8e25c859..b9236083a91ce8579db38b3dbb96731091239a41 100644
|
| --- a/build/toolchain/nacl/BUILD.gn
|
| +++ b/build/toolchain/nacl/BUILD.gn
|
| @@ -9,16 +9,14 @@ toolchain("x86_newlib") {
|
| ld = toolprefix + "g++"
|
|
|
| tool("cc") {
|
| - command =
|
| - "$cc -MMD -MF \$out.d \$defines \$includes \$cflags \$cflags_c -c \$in -o \$out"
|
| + command = "$cc -MMD -MF \$out.d \$defines \$includes \$cflags \$cflags_c -c \$in -o \$out"
|
| description = "CC(NaCl x86 Newlib) \$out"
|
| depfile = "\$out.d"
|
| depsformat = "gcc"
|
| }
|
| tool("cxx") {
|
| # cflags_pch_cc
|
| - command =
|
| - "$cxx -MMD -MF \$out.d \$defines \$includes \$cflags \$cflags_cc -c \$in -o \$out"
|
| + command = "$cxx -MMD -MF \$out.d \$defines \$includes \$cflags \$cflags_cc -c \$in -o \$out"
|
| description = "CXX(NaCl x86 Newlib) \$out"
|
| depfile = "\$out.d"
|
| depsformat = "gcc"
|
| @@ -28,16 +26,14 @@ toolchain("x86_newlib") {
|
| description = "AR(NaCl x86 Newlib) \$out"
|
| }
|
| tool("solink") {
|
| - command =
|
| - "if [ ! -e \$lib -o ! -e \${lib}.TOC ]; then $ld -shared \$ldflags -o \$lib -Wl,-soname=\$soname -Wl,--whole-archive \$in \$solibs -Wl,--no-whole-archive \$libs && { readelf -d \${lib} | grep SONAME ; nm -gD -f p \${lib} | cut -f1-2 -d' '; } > \${lib}.TOC; else $ld -shared \$ldflags -o \$lib -Wl,-soname=\$soname -Wl,--whole-archive \$in \$solibs -Wl,--no-whole-archive \$libs && { readelf -d \${lib} | grep SONAME ; nm -gD -f p \${lib} | cut -f1-2 -d' '; } > \${lib}.tmp && if ! cmp -s \${lib}.tmp \${lib}.TOC; then mv \${lib}.tmp \${lib}.TOC ; fi; fi"
|
| + command = "if [ ! -e \$lib -o ! -e \${lib}.TOC ]; then $ld -shared \$ldflags -o \$lib -Wl,-soname=\$soname -Wl,--whole-archive \$in \$solibs -Wl,--no-whole-archive \$libs && { readelf -d \${lib} | grep SONAME ; nm -gD -f p \${lib} | cut -f1-2 -d' '; } > \${lib}.TOC; else $ld -shared \$ldflags -o \$lib -Wl,-soname=\$soname -Wl,--whole-archive \$in \$solibs -Wl,--no-whole-archive \$libs && { readelf -d \${lib} | grep SONAME ; nm -gD -f p \${lib} | cut -f1-2 -d' '; } > \${lib}.tmp && if ! cmp -s \${lib}.tmp \${lib}.TOC; then mv \${lib}.tmp \${lib}.TOC ; fi; fi"
|
| description = "SOLINK(NaCl x86 Newlib) \$lib"
|
|
|
| #pool = "link_pool"
|
| restat = "1"
|
| }
|
| tool("link") {
|
| - command =
|
| - "$ld \$ldflags -o \$out -Wl,--start-group \$in \$solibs -Wl,--end-group \$libs"
|
| + command = "$ld \$ldflags -o \$out -Wl,--start-group \$in \$solibs -Wl,--end-group \$libs"
|
| description = "LINK(NaCl x86 Newlib) \$out"
|
|
|
| #pool = "link_pool"
|
|
|