Patch #1160164: Use ReleaseItanium for zlib build.

Will backport to 2.4.

diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln
index c09256fd9350f0ca12af7de48d7c0e41d68cd674..37f26212f1f2da05629b4d7f20fcbdbdfe09a335 100644 (file)
--- a/PCbuild/pcbuild.sln
+++ b/PCbuild/pcbuild.sln
@@ -179,8 +179,8 @@ Global
                {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Debug.Build.0 = Debug|Win32\r
                {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Release.ActiveCfg = Release|Win32\r
                {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Release.Build.0 = Release|Win32\r
-               {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.ActiveCfg = Release|Win32\r
-               {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.Build.0 = Release|Win32\r
+               {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32\r
+               {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.Build.0 = ReleaseItanium|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionItems) = postSolution\r
                readme.txt = readme.txt\r

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 9aa28f27cf9debcaba13f578ba1316be1ed41893..d9591bd83ce080b9ed9cd54670a5d0b1a508ef75 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -135,6 +135,9 @@ zlib
     However, the zlib project is not smart enough to remove anything under
     zlib-1.2.3\ when you do a clean, so if you want to rebuild zlib.lib
     you need to clean up zlib-1.2.3\ by hand.
+    When building zlib.pyd for Itanium, the pre-link build step won't work,
+    so you will need to invoke nmake manually, using an IA64 build 
+    environment.
 
 bz2
     Python wrapper for the libbz2 compression library.  Homepage