summaryrefslogtreecommitdiffstats
path: root/PCbuild
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2015-01-15 17:16:51 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2015-01-15 17:16:51 (GMT)
commit4f3395f7eb88bfd63ad4a5f28748eacdfe4b6eb6 (patch)
tree1c2f4ab4219344fd508e5720a9435292f5be5aee /PCbuild
parent596b751f978225d7384b8f7551643b9a0e1e899b (diff)
downloadcpython-4f3395f7eb88bfd63ad4a5f28748eacdfe4b6eb6.zip
cpython-4f3395f7eb88bfd63ad4a5f28748eacdfe4b6eb6.tar.gz
cpython-4f3395f7eb88bfd63ad4a5f28748eacdfe4b6eb6.tar.bz2
Fix up PCbuild/readme.txt a bit.
Removes an incorrect assertion (that the build script will choose the latest OpenSSL sources it can find), fixes NASM's homepage, and rewords the section about NASM to make it more clear that you don't have to install your own.
Diffstat (limited to 'PCbuild')
-rw-r--r--PCbuild/readme.txt11
1 files changed, 4 insertions, 7 deletions
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 4d4c7da..cf6ab7f 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -138,15 +138,12 @@ _ssl
obtaining external sources then you don't need to manually get the source
above via subversion. **
- Alternatively, get the latest version from http://www.openssl.org.
- You can (theoretically) use any version of OpenSSL you like - the
- build process will automatically select the latest version.
-
- You must install the NASM assembler from
- http://nasm.sf.net
- for x86 builds. Put nasm.exe anywhere in your PATH. If you use the
+ The NASM assembler is required to build OpenSSL. If you use the
Tools\buildbot\external(-amd64).bat method for getting sources, it also
downloads a version of NASM, which the ssl build script will add to PATH.
+ Otherwise, you can download the NASM installer from
+ http://www.nasm.us/
+ and add NASM to your PATH.
You can also install ActivePerl from
http://www.activestate.com/activeperl/