Author: Armin Rigo <[email protected]>
Branch:
Changeset: r49387:f718100d7782
Date: 2011-11-14 10:44 +0100
http://bitbucket.org/pypy/pypy/changeset/f718100d7782/
Log: Backout ad8b93cf993c and 38f173ee998a, which fail on tannit.
diff --git a/pypy/translator/platform/__init__.py
b/pypy/translator/platform/__init__.py
--- a/pypy/translator/platform/__init__.py
+++ b/pypy/translator/platform/__init__.py
@@ -42,8 +42,6 @@
so_prefixes = ('',)
- extra_libs = []
-
def __init__(self, cc):
if self.__class__ is Platform:
raise TypeError("You should not instantiate Platform class
directly")
@@ -183,7 +181,7 @@
link_files = self._linkfiles(eci.link_files)
export_flags = self._exportsymbols_link_flags(eci)
return (library_dirs + list(self.link_flags) + export_flags +
- link_files + list(eci.link_extra) + libraries +
self.extra_libs)
+ link_files + list(eci.link_extra) + libraries)
def _exportsymbols_link_flags(self, eci, relto=None):
if eci.export_symbols:
diff --git a/pypy/translator/platform/linux.py
b/pypy/translator/platform/linux.py
--- a/pypy/translator/platform/linux.py
+++ b/pypy/translator/platform/linux.py
@@ -6,8 +6,7 @@
class BaseLinux(BasePosix):
name = "linux"
- link_flags = ('-pthread',)
- extra_libs = ['-lrt']
+ link_flags = ('-pthread', '-lrt')
cflags = ('-O3', '-pthread', '-fomit-frame-pointer',
'-Wall', '-Wno-unused')
standalone_only = ()
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
