summaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2011-03-12 00:00:39 (GMT)
committerEvan Martin <martine@danga.com>2011-03-12 00:00:39 (GMT)
commit92baa81d5111cc42ba8a9ea1b5d5e1fbf1c38a0e (patch)
tree97f4f8fa9f25be737859e6e6c28ee5534070faaf /misc
parent5377de65e83ecff0ae1df241ed51d9e0dddbdcd7 (diff)
downloadNinja-92baa81d5111cc42ba8a9ea1b5d5e1fbf1c38a0e.zip
Ninja-92baa81d5111cc42ba8a9ea1b5d5e1fbf1c38a0e.tar.gz
Ninja-92baa81d5111cc42ba8a9ea1b5d5e1fbf1c38a0e.tar.bz2
fix terrible bug in gyp patch
Diffstat (limited to 'misc')
-rw-r--r--misc/gyp.patch10
1 files changed, 6 insertions, 4 deletions
diff --git a/misc/gyp.patch b/misc/gyp.patch
index d2fa498..81b7461 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..0f84e47
+index 0000000..be2a8af
--- /dev/null
+++ b/pylib/gyp/generator/ninja.py
-@@ -0,0 +1,544 @@
+@@ -0,0 +1,546 @@
+#!/usr/bin/python
+
+# Copyright (c) 2010 Google Inc. All rights reserved.
@@ -348,7 +348,8 @@ index 0000000..0f84e47
+ continue
+ input = self.InputPath(source)
+ output = self.OutputPath(filename + '.o')
-+ self.WriteEdge([output], command, [input], predepends)
++ self.WriteEdge([output], command, [input],
++ order_only_inputs=predepends)
+ outputs.append(output)
+ self.WriteLn()
+ return outputs
@@ -385,7 +386,8 @@ index 0000000..0f84e47
+ # Write a short name to build this target. This benefits both the
+ # "build chrome" case as well as the gyp tests, which expect to be
+ # able to run actions and build libraries by their short name.
-+ self.WriteEdge([self.name], 'phony', [output], use_prebuild_stamp=False)
++ self.WriteEdge([self.name], 'phony', [output],
++ use_prebuild_stamp=False)
+
+ return output
+