Index: tools/gn/secondary/build/config/mac/BUILD.gn |
diff --git a/tools/gn/secondary/build/config/mac/BUILD.gn b/tools/gn/secondary/build/config/mac/BUILD.gn |
index a4026b6e36e8f68874cb1d33d50e7b8bda1c53ac..55ffd03cd203793bcd230e7cb09a0041f31f924e 100644 |
--- a/tools/gn/secondary/build/config/mac/BUILD.gn |
+++ b/tools/gn/secondary/build/config/mac/BUILD.gn |
@@ -40,23 +40,17 @@ toolchain("clang") { |
deps = "gcc" |
} |
tool("alink") { |
- command = "rm -f \$out && ./gyp-mac-tool filter-libtool libtool \$libtool_flags -static -o \$out \$in\$postbuilds" |
+ command = "rm -f \$out && ./gyp-mac-tool filter-libtool libtool \$libtool_flags -static -o \$out \$in \$postbuilds" |
description = "LIBTOOL-STATIC \$out, POSTBUILDS" |
} |
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" |
+ 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" |
#pool = "link_pool" |
restat = "1" |
} |
- tool("solink_module") { |
- 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(module) \$lib, POSTBUILDS" |
- #pool = "link_pool" |
- restat = "1" |
- } |
tool("link") { |
- command = "$ld \$ldflags -o \$out \$in \$solibs \$libs\$postbuilds" |
+ command = "$ld \$ldflags -o \$out \$in \$solibs \$libs \$postbuilds" |
description = "LINK \$out, POSTBUILDS" |
#pool = "link_pool" |
} |
@@ -69,7 +63,7 @@ toolchain("clang") { |
# description = "MACTOOL \$mactool_cmd \$in" |
#} |
#tool("package_framework") { |
- # command = "./gyp-mac-tool package-framework \$out \$version\$postbuilds && touch \$out" |
+ # command = "./gyp-mac-tool package-framework \$out \$version \$postbuilds && touch \$out" |
# description = "PACKAGE FRAMEWORK \$out, POSTBUILDS" |
#} |
tool("stamp") { |