diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2005-08-25 07:11:31 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2005-08-25 07:11:31 +0000 |
| commit | 3fa5575fa4d06c3ae3909f5a8b4f29274767e33d (patch) | |
| tree | c22ac69a13899d25db691f8ba14044c59c68ebf1 | |
| parent | 532efabf1dcae183c586b78007baaaf59e4d61ca (diff) | |
| download | cpython-git-3fa5575fa4d06c3ae3909f5a8b4f29274767e33d.tar.gz | |
Patch #1160164: Use ReleaseItanium for zlib build.
Will backport to 2.4.
| -rw-r--r-- | PCbuild/pcbuild.sln | 4 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln index c09256fd93..37f26212f1 100644 --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -179,8 +179,8 @@ Global {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Debug.Build.0 = Debug|Win32
{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Release.ActiveCfg = Release|Win32
{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Release.Build.0 = Release|Win32
- {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.ActiveCfg = Release|Win32
- {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.Build.0 = Release|Win32
+ {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32
+ {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.Build.0 = ReleaseItanium|Win32
EndGlobalSection
GlobalSection(SolutionItems) = postSolution
readme.txt = readme.txt
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 9aa28f27cf..d9591bd83c 100644 --- 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 |