Kaydet (Commit) 38fed61f authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Kill the ProjectReference to ssl.vcxproj, too

Otherwise it would try to build the ssl.vcxproj which we don't want
(because we want to use the openSSL already built from solver), and
which fails anyway because for some reason it wants to run
python_d.exe.

Change-Id: I7471bc26ae96be84b976ba35bb959d75678df980
üst 28327c28
-*- Mode: diff -*-
Tweak SSL build to find OpenSSL in solver & not build it itself in "ssl.vcproj" etc. Tweak SSL build to find OpenSSL in solver & not build it itself in "ssl.vcproj" etc.
diff -ru python3.old_/Modules/Setup.dist python3/Modules/Setup.dist diff -ru python3.old_/Modules/Setup.dist python3/Modules/Setup.dist
...@@ -327,6 +329,17 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj ...@@ -327,6 +329,17 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@@ -271,10 +271,6 @@
<Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="ssl.vcxproj">
- <Project>{e5b04cc0-eb4c-42ab-b4dc-18ef95f864b0}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
<ProjectReference Include="_socket.vcxproj">
<Project>{86937f53-c189-40ef-8ce8-8759d8e7d480}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff -ru python3.old_/setup.py python3/setup.py diff -ru python3.old_/setup.py python3/setup.py
--- python3.old_/setup.py 2012-09-29 10:00:50.000000000 +0200 --- python3.old_/setup.py 2012-09-29 10:00:50.000000000 +0200
+++ python3/setup.py 2012-11-13 14:18:23.484158149 +0100 +++ python3/setup.py 2012-11-13 14:18:23.484158149 +0100
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment