Author: Philip Jenvey <[email protected]>
Branch:
Changeset: r75215:3b999828c913
Date: 2015-01-02 16:53 -0800
http://bitbucket.org/pypy/pypy/changeset/3b999828c913/
Log: attempt to fix lldebug and the like w/ the now default of shared
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
@@ -400,15 +400,15 @@
mk.definition('PROFOPT', profopt)
rules = [
- ('clean', '', 'rm -f $(OBJECTS) $(TARGET) $(GCMAPFILES)
$(ASMFILES) *.gc?? ../module_cache/*.gc??'),
- ('clean_noprof', '', 'rm -f $(OBJECTS) $(TARGET) $(GCMAPFILES)
$(ASMFILES)'),
+ ('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" $(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 -DRPY_ASSERT
-DRPY_LL_ASSERT" debug_target'),
- ('profile', '', '$(MAKE) CFLAGS="-g -O1 -pg $(CFLAGS)
-fno-omit-frame-pointer" LDFLAGS="-pg $(LDFLAGS)" $(TARGET)'),
+ ('profile', '', '$(MAKE) CFLAGS="-g -O1 -pg $(CFLAGS)
-fno-omit-frame-pointer" LDFLAGS="-pg $(LDFLAGS)" $(DEFAULT_TARGET)'),
]
if self.has_profopt():
rules.append(
@@ -471,7 +471,7 @@
if self.translator.platform.name == 'msvc':
mk.rule('debug_target', 'debugmode_$(DEFAULT_TARGET)', 'rem')
else:
- mk.rule('debug_target', '$(TARGET)', '#')
+ mk.rule('debug_target', '$(DEFAULT_TARGET)', '#')
mk.write()
#self.translator.platform,
# ,
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit