[pypy-svn] pypy default: Fix. Thanks dcolish for reporting this.
arigo
commits-noreply at bitbucket.org
Sun Feb 20 13:09:25 CET 2011
Author: Armin Rigo <arigo at tunes.org>
Branch:
Changeset: r42186:c0b31ff7151e
Date: 2011-02-20 13:08 +0100
http://bitbucket.org/pypy/pypy/changeset/c0b31ff7151e/
Log: Fix. Thanks dcolish for reporting this.
diff --git a/pypy/rlib/rlocale.py b/pypy/rlib/rlocale.py
--- a/pypy/rlib/rlocale.py
+++ b/pypy/rlib/rlocale.py
@@ -14,15 +14,22 @@
HAVE_LANGINFO = sys.platform != 'win32'
HAVE_LIBINTL = sys.platform != 'win32'
+libraries = []
if HAVE_LIBINTL:
try:
- platform.verify_eci(ExternalCompilationInfo(includes=['libintl.h']))
+ platform.verify_eci(ExternalCompilationInfo(includes=['libintl.h'],
+ libraries=['intl']))
+ libraries.append('intl')
except platform.CompilationError:
- HAVE_LIBINTL = False
+ try:
+ platform.verify_eci(ExternalCompilationInfo(includes=['libintl.h']))
+ except platform.CompilationError:
+ HAVE_LIBINTL = False
class CConfig:
includes = ['locale.h', 'limits.h', 'ctype.h']
+ libraries = libraries
if HAVE_LANGINFO:
includes += ['langinfo.h']
@@ -31,7 +38,7 @@
if sys.platform == 'win32':
includes += ['windows.h']
_compilation_info_ = ExternalCompilationInfo(
- includes=includes
+ includes=includes, libraries=libraries
)
HAVE_BIND_TEXTDOMAIN_CODESET = platform.Has('bind_textdomain_codeset')
lconv = platform.Struct("struct lconv", [
More information about the Pypy-commit
mailing list