[pypy-svn] r45930 - pypy/branch/pypy-more-rtti-inprogress/module/thread

[arigo at codespeak.net]

Author: arigo
Date: Thu Aug 23 15:07:20 2007
New Revision: 45930

Modified:
   pypy/branch/pypy-more-rtti-inprogress/module/thread/ll_thread.py
Log:
Don't put the 'translator/c/src' directory in the include dirs directly.
So far we always put only 'translator/c' and include 'src/xyz.h'.


Modified: pypy/branch/pypy-more-rtti-inprogress/module/thread/ll_thread.py
==============================================================================
--- pypy/branch/pypy-more-rtti-inprogress/module/thread/ll_thread.py	(original)
+++ pypy/branch/pypy-more-rtti-inprogress/module/thread/ll_thread.py	Thu Aug 23 15:07:20 2007
@@ -19,19 +19,19 @@
 
 from pypy.tool.autopath import pypydir
 pypydir = py.path.local(pypydir)
-srcdir = pypydir.join('translator', 'c', 'src')
-includes = ['unistd.h', 'thread.h']
+c_dir = pypydir.join('translator', 'c')
+includes = ['unistd.h', 'src/thread.h']
 
 def setup_thread_so():
-    files = [srcdir.join('thread.c')]
+    files = [c_dir.join('src', 'thread.c')]
     modname = '_thread'
-    cache_c_module(files, modname, include_dirs=[str(srcdir)])
+    cache_c_module(files, modname, include_dirs=[str(c_dir)])
     return str(pypydir.join('_cache', modname)) + '.so'
 libraries = [setup_thread_so()]
 
 def llexternal(name, args, result):
     return rffi.llexternal(name, args, result, includes=includes,
-                           libraries=libraries, include_dirs=[str(srcdir)])
+                           libraries=libraries, include_dirs=[str(c_dir)])
 
 CALLBACK = lltype.Ptr(lltype.FuncType([rffi.VOIDP], rffi.VOIDP))
 c_thread_start = llexternal('RPyThreadStart', [CALLBACK, rffi.VOIDP], rffi.INT)