[pypy-svn] r66064 - pypy/branch/pyjitpl5/pypy/translator/platform

[arigo at codespeak.net]

Author: arigo
Date: Tue Jun 30 16:39:10 2009
New Revision: 66064

Added:
   pypy/branch/pyjitpl5/pypy/translator/platform/posix.py.merge.tmp
      - copied, changed from r66039, pypy/branch/pyjitpl5/pypy/translator/platform/posix.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/trunk/pypy/translator/platform/posix.py
revisions 62865 to 66039:

    ------------------------------------------------------------------------
    r65067 | fijal | 2009-05-05 18:20:39 +0200 (Tue, 05 May 2009) | 2 lines
    
    (kirma) FreeBSD platform code should not assume make=gmake
    
    ------------------------------------------------------------------------


Copied: pypy/branch/pyjitpl5/pypy/translator/platform/posix.py.merge.tmp (from r66039, pypy/branch/pyjitpl5/pypy/translator/platform/posix.py)
==============================================================================
--- pypy/branch/pyjitpl5/pypy/translator/platform/posix.py	(original)
+++ pypy/branch/pyjitpl5/pypy/translator/platform/posix.py.merge.tmp	Tue Jun 30 16:39:10 2009
@@ -8,6 +8,7 @@
 
 class BasePosix(Platform):
     exe_ext = ''
+    make_cmd = 'make'
 
     def __init__(self, cc=None):
         if cc is None:
@@ -109,7 +110,7 @@
         else:
             path = path_to_makefile
         log.execute('make in %s' % (path,))
-        returncode, stdout, stderr = _run_subprocess('make', ['-C', str(path)])
+        returncode, stdout, stderr = _run_subprocess(self.make_cmd, ['-C', str(path)])
         self._handle_error(returncode, stdout, stderr, path.join('make'))
 
 class Definition(object):