diff options
| author | Evan Martin <martine@danga.com> | 2011-02-08 18:23:33 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2011-02-08 18:23:33 (GMT) |
| commit | 78de420b535a80e814f796a67d2f62a24603f8c5 (patch) | |
| tree | 9d696fbcefc616fed770e035aa6d349ab13c3371 /misc | |
| parent | d52238f212c8e5ec914270a599d8e690e6af9265 (diff) | |
| download | Ninja-78de420b535a80e814f796a67d2f62a24603f8c5.zip Ninja-78de420b535a80e814f796a67d2f62a24603f8c5.tar.gz Ninja-78de420b535a80e814f796a67d2f62a24603f8c5.tar.bz2 | |
quick-fix gyp.patch for chrome change
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/gyp.patch | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/misc/gyp.patch b/misc/gyp.patch index ca69bf0..b3761af 100644 --- a/misc/gyp.patch +++ b/misc/gyp.patch @@ -7,10 +7,10 @@ index 0000000..0d20b64 +*.pyc diff --git a/pylib/gyp/generator/ninja.py b/pylib/gyp/generator/ninja.py new file mode 100644 -index 0000000..82992d9 +index 0000000..23f925b --- /dev/null +++ b/pylib/gyp/generator/ninja.py -@@ -0,0 +1,542 @@ +@@ -0,0 +1,545 @@ +#!/usr/bin/python + +# Copyright (c) 2010 Google Inc. All rights reserved. @@ -47,7 +47,8 @@ index 0000000..82992d9 +} + +NINJA_BASE = """\ -+# Build directory. ++builddir = ninja ++# Short alias for builddir. +b = ninja + +cc = %(cc)s @@ -161,6 +162,8 @@ index 0000000..82992d9 + sources = spec.get('sources', []) + extra_sources + if sources: + link_deps = self.WriteSources(config, sources, sources_predepends) ++ # Some actions/rules output 'sources' that are already object files. ++ link_deps += [f for f in sources if f.endswith('.o')] + + # The final output of our target depends on the last output of the + # above steps. @@ -661,7 +664,7 @@ index 6171d15..8c63026 100644 test.run_gyp('prog1.gyp', '--depth=..', chdir='src') diff --git a/test/lib/TestGyp.py b/test/lib/TestGyp.py -index fcdd12c..fb54760 100644 +index 23228d2..824b4a9 100644 --- a/test/lib/TestGyp.py +++ b/test/lib/TestGyp.py @@ -391,6 +391,47 @@ class TestGypMake(TestGypBase): @@ -712,7 +715,7 @@ index fcdd12c..fb54760 100644 class TestGypMSVS(TestGypBase): """ Subclass for testing the GYP Visual Studio generator. -@@ -670,6 +711,7 @@ format_class_list = [ +@@ -705,6 +746,7 @@ format_class_list = [ TestGypGypd, TestGypMake, TestGypMSVS, |