Chromium Code Reviews| Index: build/toolchain/mac/BUILD.gn |
| diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn |
| index c9a58b4ba0296565c3b79bd34b0134cee4fe012e..d70774d14f832343dba96f9bd4c5992581e41090 100644 |
| --- a/build/toolchain/mac/BUILD.gn |
| +++ b/build/toolchain/mac/BUILD.gn |
| @@ -80,18 +80,24 @@ template("mac_clang_toolchain") { |
| deps = "gcc" |
| } |
| tool("alink") { |
| - command = "rm -f \$out && ./gyp-mac-tool filter-libtool libtool \$libtool_flags -static -o \$out \$in \$postbuilds" |
| - description = "LIBTOOL-STATIC \$out, POSTBUILDS" |
|
Nico
2014/05/30 16:37:24
postbuilds usually take most of the time, so omitt
brettw
2014/05/30 17:24:39
We don't do any postbuilds. Anything that's requir
Nico
2014/05/30 17:35:38
That's a good point :-)
|
| + command = "rm -f \$out && ./gyp-mac-tool filter-libtool libtool \$libtool_flags -static -o \$out @\$rspfile \$postbuilds" |
| + description = "LIBTOOL-STATIC \$out" |
| + rspfile = "\$out.rsp" |
|
Nico
2014/05/30 16:37:24
Oh, I suppose my comment about spaces is more appr
|
| + rspfile_content = "\$in" |
| } |
| tool("solink") { |
| - command = "if [ ! -e \$lib -o ! -e \${lib}.TOC ] || otool -l \$lib | grep -q LC_REEXPORT_DYLIB ; then $ld -shared \$ldflags -o \$lib \$in \$solibs \$libs \$postbuilds && { otool -l \$lib | grep LC_ID_DYLIB -A 5; nm -gP \$lib | cut -f1-2 -d' ' | grep -v U\$\$; true; } > \${lib}.TOC; else $ld -shared \$ldflags -o \$lib \$in \$solibs \$libs \$postbuilds && { otool -l \$lib | grep LC_ID_DYLIB -A 5; nm -gP \$lib | cut -f1-2 -d' ' | grep -v U\$\$; true; } > \${lib}.tmp && if ! cmp -s \${lib}.tmp \${lib}.TOC; then mv \${lib}.tmp \${lib}.TOC ; fi; fi" |
| - description = "SOLINK \$lib, POSTBUILDS" |
| + command = "if [ ! -e \$lib -o ! -e \${lib}.TOC ] || otool -l \$lib | grep -q LC_REEXPORT_DYLIB ; then $ld -shared \$ldflags -o \$lib @\$rspfile \$solibs \$libs \$postbuilds && { otool -l \$lib | grep LC_ID_DYLIB -A 5; nm -gP \$lib | cut -f1-2 -d' ' | grep -v U\$\$; true; } > \${lib}.TOC; else $ld -shared \$ldflags -o \$lib \$in \$solibs \$libs \$postbuilds && { otool -l \$lib | grep LC_ID_DYLIB -A 5; nm -gP \$lib | cut -f1-2 -d' ' | grep -v U\$\$; true; } > \${lib}.tmp && if ! cmp -s \${lib}.tmp \${lib}.TOC; then mv \${lib}.tmp \${lib}.TOC ; fi; fi" |
| + description = "SOLINK \$lib" |
| + rspfile = "\$out.rsp" |
| + rspfile_content = "\$in" |
| #pool = "link_pool" |
| restat = "1" |
| } |
| tool("link") { |
| - command = "$ld \$ldflags -o \$out \$in \$solibs \$libs \$postbuilds" |
| - description = "LINK \$out, POSTBUILDS" |
| + command = "$ld \$ldflags -o \$out @\$rspfile \$solibs \$libs \$postbuilds" |
| + description = "LINK \$out" |
| + rspfile = "\$out.rsp" |
| + rspfile_content = "\$in" |
| #pool = "link_pool" |
| } |
| #tool("infoplist") { |