|
Matej Stuchlik |
c3a10ad |
diff -rup pypy-pypy-f66246c46ca3/rpython/translator/platform/linux.py pypy-pypy-f66246c46ca3/rpython/translator/platform/linux.py
|
|
Matej Stuchlik |
c3a10ad |
--- pypy-pypy-f66246c46ca3/rpython/translator/platform/linux.py 2013-05-27 10:35:37.679237332 +0200
|
|
Matej Stuchlik |
c3a10ad |
+++ pypy-pypy-f66246c46ca3/rpython/translator/platform/linux.py 2013-05-27 10:47:41.506354482 +0200
|
|
Matej Stuchlik |
c3a10ad |
@@ -32,19 +32,20 @@ class BaseLinux(BasePosix):
|
|
 |
4ef3f10 |
return self._pkg_config("libffi", "--libs-only-L",
|
|
 |
4ef3f10 |
['/usr/lib/libffi'])
|
|
 |
169de85 |
|
|
 |
f756cfc |
- def library_dirs_for_libffi_a(self):
|
|
 |
f756cfc |
- # places where we need to look for libffi.a
|
|
 |
4ef3f10 |
- # XXX obscuuure! only look for libffi.a if run with translate.py
|
|
 |
4ef3f10 |
- if 'translate' in sys.modules:
|
|
Matej Stuchlik |
c3a10ad |
- if sys.maxint > 2**32:
|
|
Matej Stuchlik |
c3a10ad |
- host = 'x86_64'
|
|
Matej Stuchlik |
c3a10ad |
- else:
|
|
Matej Stuchlik |
c3a10ad |
- host = 'x86'
|
|
Matej Stuchlik |
c3a10ad |
- return self.library_dirs_for_libffi() + [
|
|
Matej Stuchlik |
c3a10ad |
- '/usr/lib',
|
|
Matej Stuchlik |
c3a10ad |
- '/usr/lib/%s-linux-gnu/' % host]
|
|
 |
4ef3f10 |
- else:
|
|
 |
4ef3f10 |
- return []
|
|
Matej Stuchlik |
c3a10ad |
+ #Fedora, at least, has the shared version but not the static:
|
|
 |
f756cfc |
+ #def library_dirs_for_libffi_a(self):
|
|
 |
f756cfc |
+ # # places where we need to look for libffi.a
|
|
 |
4ef3f10 |
+ # # XXX obscuuure! only look for libffi.a if run with translate.py
|
|
 |
4ef3f10 |
+ # if 'translate' in sys.modules:
|
|
Matej Stuchlik |
c3a10ad |
+ # if sys.maxint > 2**32:
|
|
Matej Stuchlik |
c3a10ad |
+ # host = 'x86_64'
|
|
Matej Stuchlik |
c3a10ad |
+ # else:
|
|
Matej Stuchlik |
c3a10ad |
+ # host = 'x86'
|
|
Matej Stuchlik |
c3a10ad |
+ # return self.library_dirs_for_libffi() + [
|
|
Matej Stuchlik |
c3a10ad |
+ # '/usr/lib',
|
|
Matej Stuchlik |
c3a10ad |
+ # '/usr/lib/%s-linux-gnu/' % host]
|
|
 |
4ef3f10 |
+ # else:
|
|
 |
4ef3f10 |
+ # return []
|
|
 |
f756cfc |
|
|
 |
f756cfc |
|
|
 |
4ef3f10 |
class Linux(BaseLinux):
|