Author: mattip <matti.pi...@gmail.com>
Branch:
Changeset: r85905:a34bf4f9993a
Date: 2016-07-29 12:25 -0500
http://bitbucket.org/pypy/pypy/changeset/a34bf4f9993a/
Log: fix Makefile clean, non-optimization for win32
diff --git a/rpython/translator/c/genc.py b/rpython/translator/c/genc.py
--- a/rpython/translator/c/genc.py
+++ b/rpython/translator/c/genc.py
@@ -422,14 +422,11 @@
mk.definition('PROFOPT', profopt)
rules = [
- ('clean', '', 'rm -f $(OBJECTS) $(DEFAULT_TARGET) $(TARGET)
$(GCMAPFILES) $(ASMFILES) *.gc?? ../module_cache/*.gc??'),
- ('clean_noprof', '', 'rm -f $(OBJECTS) $(DEFAULT_TARGET) $(TARGET)
$(GCMAPFILES) $(ASMFILES)'),
('debug', '', '$(MAKE) CFLAGS="$(DEBUGFLAGS) -DRPY_ASSERT"
debug_target'),
('debug_exc', '', '$(MAKE) CFLAGS="$(DEBUGFLAGS) -DRPY_ASSERT
-DDO_LOG_EXC" debug_target'),
('debug_mem', '', '$(MAKE) CFLAGS="$(DEBUGFLAGS) -DRPY_ASSERT
-DPYPY_USE_TRIVIAL_MALLOC" debug_target'),
('llsafer', '', '$(MAKE) CFLAGS="-O2 -DRPY_LL_ASSERT"
$(DEFAULT_TARGET)'),
('lldebug', '', '$(MAKE) CFLAGS="$(DEBUGFLAGS) -DRPY_ASSERT
-DRPY_LL_ASSERT" debug_target'),
- ('lldebug0','', '$(MAKE) CFLAGS="$(DEBUGFLAGS) -O0
-DMAX_STACK_SIZE=8192000 -DRPY_ASSERT -DRPY_LL_ASSERT" debug_target'),
('profile', '', '$(MAKE) CFLAGS="-g -O1 -pg $(CFLAGS)
-fno-omit-frame-pointer" LDFLAGS="-pg $(LDFLAGS)" $(DEFAULT_TARGET)'),
]
if self.has_profopt():
@@ -443,6 +440,17 @@
for rule in rules:
mk.rule(*rule)
+ if self.translator.platform.name == 'msvc':
+ mk.rule('lldebug0','', '$(MAKE) CFLAGS="$(DEBUGFLAGS) -Od
-DMAX_STACK_SIZE=8192000 -DRPY_ASSERT -DRPY_LL_ASSERT" debug_target'),
+ wildcards = '..\*.obj ..\*.pdb ..\*.lib ..\*.dll ..\*.manifest
..\*.exp *.pch'
+ cmd = r'del /s %s $(DEFAULT_TARGET) $(TARGET) $(GCMAPFILES)
$(ASMFILES)' % wildcards
+ mk.rule('clean', '', cmd + ' *.gc?? ..\module_cache\*.gc??')
+ mk.rule('clean_noprof', '', cmd)
+ else:
+ mk.rule('lldebug0','', '$(MAKE) CFLAGS="$(DEBUGFLAGS) -O0
-DMAX_STACK_SIZE=8192000 -DRPY_ASSERT -DRPY_LL_ASSERT" debug_target'),
+ mk.rule('clean', '', 'rm -f $(OBJECTS) $(DEFAULT_TARGET) $(TARGET)
$(GCMAPFILES) $(ASMFILES) *.gc?? ../module_cache/*.gc??')
+ mk.rule('clean_noprof', '', 'rm -f $(OBJECTS) $(DEFAULT_TARGET)
$(TARGET) $(GCMAPFILES) $(ASMFILES)')
+
#XXX: this conditional part is not tested at all
if self.config.translation.gcrootfinder == 'asmgcc':
if self.translator.platform.name == 'msvc':
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
