[pypy-svn] r68276 - pypy/trunk/pypy/translator/c

arigo at codespeak.net arigo at codespeak.net
Fri Oct 9 16:09:41 CEST 2009


Author: arigo
Date: Fri Oct  9 16:09:41 2009
New Revision: 68276

Modified:
   pypy/trunk/pypy/translator/c/genc.py
Log:
Oups.  "make clean" did not remove the .s files, if you have some left
around from an explicit command like "make implement.s".


Modified: pypy/trunk/pypy/translator/c/genc.py
==============================================================================
--- pypy/trunk/pypy/translator/c/genc.py	(original)
+++ pypy/trunk/pypy/translator/c/genc.py	Fri Oct  9 16:09:41 2009
@@ -463,8 +463,8 @@
             mk.definition('PROFOPT', profopt)
 
         rules = [
-            ('clean', '', 'rm -f $(OBJECTS) $(TARGET) $(GCMAPFILES) *.gc?? ../module_cache/*.gc??'),
-            ('clean_noprof', '', 'rm -f $(OBJECTS) $(TARGET) $(GCMAPFILES)'),
+            ('clean', '', 'rm -f $(OBJECTS) $(TARGET) $(GCMAPFILES) $(ASMFILES) *.gc?? ../module_cache/*.gc??'),
+            ('clean_noprof', '', 'rm -f $(OBJECTS) $(TARGET) $(GCMAPFILES) $(ASMFILES)'),
             ('debug', '', '$(MAKE) CFLAGS="-g -O1 -DRPY_ASSERT" $(TARGET)'),
             ('debug_exc', '', '$(MAKE) CFLAGS="-g -O1 -DRPY_ASSERT -DDO_LOG_EXC" $(TARGET)'),
             ('debug_mem', '', '$(MAKE) CFLAGS="-g -O1 -DRPY_ASSERT -DTRIVIAL_MALLOC_DEBUG" $(TARGET)'),
@@ -486,8 +486,10 @@
             mk.rule(*rule)
 
         if self.config.translation.gcrootfinder == 'asmgcc':
+            sfiles = ['%s.s' % (cfile[:-2],) for cfile in mk.cfiles]
             lblsfiles = ['%s.lbl.s' % (cfile[:-2],) for cfile in mk.cfiles]
             gcmapfiles = ['%s.gcmap' % (cfile[:-2],) for cfile in mk.cfiles]
+            mk.definition('ASMFILES', sfiles)
             mk.definition('ASMLBLFILES', lblsfiles)
             mk.definition('GCMAPFILES', gcmapfiles)
             mk.definition('OBJECTS', '$(ASMLBLFILES) gcmaptable.s')



More information about the Pypy-commit mailing list