summaryrefslogtreecommitdiff
path: root/PCbuild/readme.txt
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2014-11-01 18:42:46 -0500
committerZachary Ware <zachary.ware@gmail.com>2014-11-01 18:42:46 -0500
commite470d092cb8ea1fc6a3d528f40799dca9cf86f17 (patch)
treefc78f5ed78649b50d93c5c582999537a6f583414 /PCbuild/readme.txt
parentbac47773f1c30ec8e6ab0279f06970d679272580 (diff)
downloadcpython-git-e470d092cb8ea1fc6a3d528f40799dca9cf86f17.tar.gz
Issue #17717: Pull NASM from svn.python.org for OpenSSL build.
Diffstat (limited to 'PCbuild/readme.txt')
-rw-r--r--PCbuild/readme.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 1b6a594c12..535ea00a51 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -3,9 +3,8 @@ Quick Start Guide
1. Install Microsoft Visual C++ 2010 SP1, any edition.
2. Install Subversion, and make sure 'svn.exe' is on your PATH.
-3. Install NASM, and make sure 'nasm.exe' is on your PATH.
-4. Run "build.bat -e" to build Python in 32-bit Release configuration.
-5. (Optional, but recommended) Run the test suite with "rt.bat -q".
+3. Run "build.bat -e" to build Python in 32-bit Release configuration.
+4. (Optional, but recommended) Run the test suite with "rt.bat -q".
Building Python using Microsoft Visual C++
@@ -225,7 +224,8 @@ _ssl
to be somewhere on your PATH. More recent versions of OpenSSL may
need a later version of NASM. If OpenSSL's self tests don't pass,
you should first try to update NASM and do a full rebuild of
- OpenSSL.
+ OpenSSL. get_externals.py also downloads a snapshot of NASM, and the
+ ssl sub-project includes that version of nasm.exe on PATH.
The ssl sub-project expects your OpenSSL sources to have already
been configured and be ready to build. If you get your sources