summaryrefslogtreecommitdiffstats
path: root/PCbuild
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2006-08-17 18:54:43 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2006-08-17 18:54:43 (GMT)
commit552262409dffc06b57c64ca8bfe011b8a10b2453 (patch)
treeb0802ce22a2d61cc5af5196fdb48b4bfaaf81df6 /PCbuild
parent9f04e6a110a1bd2c72a88ba04c5d5fff2d8c39e6 (diff)
downloadcpython-552262409dffc06b57c64ca8bfe011b8a10b2453.zip
cpython-552262409dffc06b57c64ca8bfe011b8a10b2453.tar.gz
cpython-552262409dffc06b57c64ca8bfe011b8a10b2453.tar.bz2
Invoke debug mk1mf.pl after running Configure.
Diffstat (limited to 'PCbuild')
-rw-r--r--PCbuild/build_ssl.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py
index 03f3d76..5ab3449 100644
--- a/PCbuild/build_ssl.py
+++ b/PCbuild/build_ssl.py
@@ -139,23 +139,26 @@ def main():
try:
os.chdir(ssl_dir)
# If the ssl makefiles do not exist, we invoke Perl to generate them.
- if not os.path.isfile(makefile):
+ # Due to a bug in this script, the makefile sometimes ended up empty
+ # Force a regeneration if it is.
+ if not os.path.isfile(makefile) or os.path.getsize(makefile)==0:
print "Creating the makefiles..."
sys.stdout.flush()
# Put our working Perl at the front of our path
os.environ["PATH"] = os.path.dirname(perl) + \
os.pathsep + \
os.environ["PATH"]
+ run_configure(configure, do_script)
if arch=="x86" and debug:
# the do_masm script in openssl doesn't generate a debug
# build makefile so we generate it here:
os.system("perl util\mk1mf.pl debug "+configure+" >"+makefile)
- run_configure(configure, do_script)
# Now run make.
- print "Executing nmake over the ssl makefiles..."
+ makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
+ print "Executing ssl makefiles:", makeCommand
sys.stdout.flush()
- rc = os.system("nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile))
+ rc = os.system(makeCommand)
if rc:
print "Executing "+makefile+" failed"
print rc