[pypy-svn] r54827 - in pypy/dist/pypy/translator/tool: . test

[arigo at codespeak.net]

Author: arigo
Date: Sat May 17 15:28:20 2008
New Revision: 54827

Modified:
   pypy/dist/pypy/translator/tool/cbuild.py
   pypy/dist/pypy/translator/tool/test/test_cbuild.py
Log:
The commandline option -DFOO really maps to "#define FOO 1".


Modified: pypy/dist/pypy/translator/tool/cbuild.py
==============================================================================
--- pypy/dist/pypy/translator/tool/cbuild.py	(original)
+++ pypy/dist/pypy/translator/tool/cbuild.py	Sat May 17 15:28:20 2008
@@ -81,7 +81,7 @@
             elif arg.startswith('-l'):
                 libraries.append(arg[2:])
             elif arg.startswith('-D'):
-                pre_include_lines.append('#define ' + arg[2:])
+                pre_include_lines.append('#define %s 1' % (arg[2:],))
         return cls(pre_include_lines=pre_include_lines,
                    include_dirs=include_dirs,
                    libraries=libraries,

Modified: pypy/dist/pypy/translator/tool/test/test_cbuild.py
==============================================================================
--- pypy/dist/pypy/translator/tool/test/test_cbuild.py	(original)
+++ pypy/dist/pypy/translator/tool/test/test_cbuild.py	Sat May 17 15:28:20 2008
@@ -131,8 +131,8 @@
                  '-lmylib1 -lmylib2 '
                  '-DMACRO1 -D_MACRO2')
         eci = ExternalCompilationInfo.from_compiler_flags(flags)
-        assert eci.pre_include_lines == ('#define MACRO1',
-                                         '#define _MACRO2')
+        assert eci.pre_include_lines == ('#define MACRO1 1',
+                                         '#define _MACRO2 1')
         assert eci.includes == ()
         assert eci.include_dirs == ('/some/include/path',
                                     '/other/include/path')