[pypy-svn] r49034 - in pypy/dist/pypy: rpython/module translator/c

[xoraxax at codespeak.net]

Author: xoraxax
Date: Sat Nov 24 14:31:54 2007
New Revision: 49034

Modified:
   pypy/dist/pypy/rpython/module/ll_os.py
   pypy/dist/pypy/translator/c/genc.py
Log:
Add a new line to the pypy macro file, fix the Makefile by including all necessary include dirs.



Modified: pypy/dist/pypy/rpython/module/ll_os.py
==============================================================================
--- pypy/dist/pypy/rpython/module/ll_os.py	(original)
+++ pypy/dist/pypy/rpython/module/ll_os.py	Sat Nov 24 14:31:54 2007
@@ -85,7 +85,7 @@
             data = {'ret_type': 'int', 'name': name}
             decls.append(decl_snippet % data)
             defs.append(def_snippet % data)
-        h_source = ['#include "sys/wait.h"'] + decls + ["#ifndef PYPY_NOT_MAIN_FILE"] + defs + ["#endif"]
+        h_source = ['#include "sys/wait.h"'] + decls + ["#ifndef PYPY_NOT_MAIN_FILE"] + defs + ["#endif", ""]
         h_file = udir.join("pypy_os_macros.h")
         h_file.write("\n".join(h_source))
 

Modified: pypy/dist/pypy/translator/c/genc.py
==============================================================================
--- pypy/dist/pypy/translator/c/genc.py	(original)
+++ pypy/dist/pypy/translator/c/genc.py	Sat Nov 24 14:31:54 2007
@@ -292,7 +292,7 @@
                     print >> f
                 prefix = ' ' * len(prefix)
 
-        compiler = self.getccompiler(extra_includes=['.'])
+        compiler = self.getccompiler(extra_includes=['.', str(self.targetdir)] + self.include_dirs)
         if sys.platform == 'darwin':
             compiler.compile_extra.append('-mdynamic-no-pic')
         if self.config.translation.compilerflags: