Commit 91d6e8fc authored by thakis@chromium.org's avatar thakis@chromium.org

roll gyp 1682:1693

The big change is initial support for ARCHS / fat binaries with ninja on mac.

1683: On Windows, don't try to create relative paths across different drives
1684: Fix typo in r1683.
1685: ninja/mac: GCC_C_LANGUAGE_STANDARD ansi is -ansi, not -std=ansi
1686: ninja/mac: Simplify slightly, no behavior change
1687: ninja/mac: Don't write emtpy postbuild variable for non-bundle links.
1688: ninja: Reduce scope of a variable, no behavior change
1689: ninja: Give WriteSources() and WriteLink() an explicit ninja_file parameter.
1690: ninja: Let WriteLink() return the linked binary, no behavior change.
1691: Linux: make ninja respect environment: CFLAGS, CXXFLAGS, LDFLAGS
1692: ninja/mac: Support multi-arch builds via ARCHS
1693: ninja/mac: Warn on conditional keys.

BUG=90185
TBR=scottmg

Review URL: https://chromiumcodereview.appspot.com/22825003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217040 0039d316-1c4b-4281-b951-d872f2087c98
parent b7652c4b
...@@ -103,7 +103,7 @@ deps = { ...@@ -103,7 +103,7 @@ deps = {
(Var("googlecode_url") % "grit-i18n") + "/trunk@129", (Var("googlecode_url") % "grit-i18n") + "/trunk@129",
"src/tools/gyp": "src/tools/gyp":
(Var("googlecode_url") % "gyp") + "/trunk@1682", (Var("googlecode_url") % "gyp") + "/trunk@1693",
"src/tools/swarm_client": "src/tools/swarm_client":
"/trunk/tools/swarm_client@" + Var("swarm_revision"), "/trunk/tools/swarm_client@" + Var("swarm_revision"),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment