Author: Matti Picus <matti.pi...@gmail.com>
Branch:
Changeset: r69107:1f3ad486ca96
Date: 2014-02-09 17:13 +0200
http://bitbucket.org/pypy/pypy/changeset/1f3ad486ca96/
Log: msvc makefile fixes for debug builds
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
@@ -432,8 +432,8 @@
mk.definition('ASMFILES', sfiles)
mk.definition('ASMLBLFILES', lblsfiles)
mk.definition('GCMAPFILES', gcmapfiles)
- if sys.platform == 'win32':
- mk.definition('DEBUGFLAGS', '/MD /Zi')
+ if self.translator.platform.name == 'msvc':
+ mk.definition('DEBUGFLAGS', '-MD -Zi')
else:
if self.config.translation.shared:
mk.definition('DEBUGFLAGS', '-O2 -fomit-frame-pointer -g
-fPIC')
@@ -489,11 +489,11 @@
mk.rule('.PRECIOUS', '%.s', "# don't remove .s files if
Ctrl-C'ed")
else:
- if sys.platform == 'win32':
- mk.definition('DEBUGFLAGS', '/MD /Zi')
+ if self.translator.platform.name == 'msvc':
+ mk.definition('DEBUGFLAGS', '-MD -Zi')
else:
mk.definition('DEBUGFLAGS', '-O1 -g')
- if sys.platform == 'win32':
+ if self.translator.platform.name == 'msvc':
mk.rule('debug_target', 'debugmode_$(DEFAULT_TARGET)', 'rem')
else:
mk.rule('debug_target', '$(TARGET)', '#')
diff --git a/rpython/translator/platform/windows.py
b/rpython/translator/platform/windows.py
--- a/rpython/translator/platform/windows.py
+++ b/rpython/translator/platform/windows.py
@@ -314,6 +314,7 @@
('CC_LINK', self.link),
('LINKFILES', eci.link_files),
('MASM', self.masm),
+ ('MAKE', 'nmake.exe'),
('_WIN32', '1'),
]
if self.x64:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
