summaryrefslogtreecommitdiffstats
path: root/PCbuild/_msi.vcproj
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2007-01-20 14:05:39 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2007-01-20 14:05:39 (GMT)
commitcc0eba9d98fb67b3ea57a2edc2a0c5de38eca0d4 (patch)
tree060f9c5a522e01c74c0b7fc8429a0924d9fa59a9 /PCbuild/_msi.vcproj
parent1b0ce8527112b997194a4e2fb9a1a850c6d73ee8 (diff)
downloadcpython-cc0eba9d98fb67b3ea57a2edc2a0c5de38eca0d4.zip
cpython-cc0eba9d98fb67b3ea57a2edc2a0c5de38eca0d4.tar.gz
cpython-cc0eba9d98fb67b3ea57a2edc2a0c5de38eca0d4.tar.bz2
Merge 53501 and 53502 from 25 branch:
Add /GS- for AMD64 and Itanium builds where missing.
Diffstat (limited to 'PCbuild/_msi.vcproj')
-rw-r--r--PCbuild/_msi.vcproj4
1 files changed, 2 insertions, 2 deletions
diff --git a/PCbuild/_msi.vcproj b/PCbuild/_msi.vcproj
index b4afeb4..cbf20ea 100644
--- a/PCbuild/_msi.vcproj
+++ b/PCbuild/_msi.vcproj
@@ -129,7 +129,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_ITANIUM"
+ AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
@@ -150,7 +150,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
- AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
+ AdditionalDependencies="fci.lib msi.lib rpcrt4.lib bufferoverflowU.lib"
OutputFile="./_msi.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"