Author: Amaury Forgeot d'Arc <[email protected]>
Branch: remove-PYPY_NOT_MAIN_FILE
Changeset: r57760:898ed07c26b4
Date: 2012-10-02 23:27 +0200
http://bitbucket.org/pypy/pypy/changeset/898ed07c26b4/
Log: Remove ll_strtod.c from the RPython core C files. The
ExternalCompilationInfo object should be enough to add it to the
Makefile.
diff --git a/pypy/translator/c/genc.py b/pypy/translator/c/genc.py
--- a/pypy/translator/c/genc.py
+++ b/pypy/translator/c/genc.py
@@ -921,7 +921,6 @@
srcdir / 'thread.c',
srcdir / 'asm.c',
srcdir / 'instrument.c',
- srcdir / 'll_strtod.c', # ifdef HAVE_RTYPER
srcdir / 'int.c',
]
if _CYGWIN:
diff --git a/pypy/translator/c/src/g_include.h
b/pypy/translator/c/src/g_include.h
--- a/pypy/translator/c/src/g_include.h
+++ b/pypy/translator/c/src/g_include.h
@@ -45,7 +45,6 @@
#ifdef HAVE_RTYPER /* only if we have an RTyper */
# include "src/rtyper.h"
# include "src/debug_traceback.h"
-# include "src/ll_strtod.h"
#endif
#ifdef PYPY_STANDALONE
diff --git a/pypy/translator/c/test/test_standalone.py
b/pypy/translator/c/test/test_standalone.py
--- a/pypy/translator/c/test/test_standalone.py
+++ b/pypy/translator/c/test/test_standalone.py
@@ -241,7 +241,7 @@
def test_separate_files(self):
# One file in translator/c/src
fname = py.path.local(pypydir).join(
- 'translator', 'c', 'src', 'll_strtod.h')
+ 'translator', 'c', 'src', 'll_strtod.c')
# One file in (another) subdir of the temp directory
dirname = udir.join("test_dir").ensure(dir=1)
@@ -273,7 +273,7 @@
# but files from pypy source dir must be copied
assert "translator/c/src" not in makefile
- assert " ll_strtod.h" in makefile
+ assert " ll_strtod.c" in makefile
assert " ll_strtod.o" in makefile
def test_debug_print_start_stop(self):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
