summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2011-11-25 07:30:19 (GMT)
committerEvan Martin <martine@danga.com>2011-11-25 07:30:19 (GMT)
commitf20e002eea38ef42d2a0de40a951d1ffb4eb2fa6 (patch)
tree19e4088bc572f3cf93d2729bb9c52a1689619a04
parent38ab41f45ff818b437942b753328a0168914fc86 (diff)
downloadNinja-f20e002eea38ef42d2a0de40a951d1ffb4eb2fa6.zip
Ninja-f20e002eea38ef42d2a0de40a951d1ffb4eb2fa6.tar.gz
Ninja-f20e002eea38ef42d2a0de40a951d1ffb4eb2fa6.tar.bz2
Revert "Merge pull request #143 from cipriancraciun/patches/python2"
This reverts commit 38ab41f45ff818b437942b753328a0168914fc86, reversing changes made to 819d6347b424f583d651b86dd1280605ddb23b88. Platforms that don't have /usr/bin/python pointing to python2 are broken.
-rwxr-xr-xconfigure.py2
-rw-r--r--misc/ninja_syntax.py2
-rwxr-xr-xmisc/ninja_test.py2
-rw-r--r--src/browse.cc2
-rwxr-xr-xsrc/browse.py2
5 files changed, 5 insertions, 5 deletions
diff --git a/configure.py b/configure.py
index 8c0592d..e31387e 100755
--- a/configure.py
+++ b/configure.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
#
# Copyright 2001 Google Inc. All Rights Reserved.
#
diff --git a/misc/ninja_syntax.py b/misc/ninja_syntax.py
index 4a1653f..6e8a87c 100644
--- a/misc/ninja_syntax.py
+++ b/misc/ninja_syntax.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python
"""Python module for generating .ninja files.
diff --git a/misc/ninja_test.py b/misc/ninja_test.py
index ba9e1e1..762fe16 100755
--- a/misc/ninja_test.py
+++ b/misc/ninja_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
# Copyright 2011 Google Inc. All Rights Reserved.
#
diff --git a/src/browse.cc b/src/browse.cc
index 64a6bcb..2e74206 100644
--- a/src/browse.cc
+++ b/src/browse.cc
@@ -46,7 +46,7 @@ void RunBrowsePython(State* /* state */, const char* ninja_command,
// exec Python, telling it to run the program from stdin.
const char* command[] = {
- "python2", "-", ninja_command, initial_target, NULL
+ "python", "-", ninja_command, initial_target, NULL
};
execvp(command[0], (char**)command);
perror("ninja: execvp");
diff --git a/src/browse.py b/src/browse.py
index 97f95a5..9901adc 100755
--- a/src/browse.py
+++ b/src/browse.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python
#
# Copyright 2001 Google Inc. All Rights Reserved.
#