Skip to content

C
cpython
Kaydet (Commit) 9f6ce2b2 authored tarafından Martin v. Löwis's avatar Martin v. Löwis
Dosyalara gözat
Seçenekler

Add /GS- flags for AMD64.

üst 3b77d3d9
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
PCbuild/_sqlite3.vcproj
Dosyayı görüntüle @ 9f6ce2b2
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_OPTERON" AdditionalOptions=" /USECL:MS_OPTERON /GS-"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
......
PCbuild/_ssl.mak
Dosyayı görüntüle @ 9f6ce2b2
...@@ -31,7 +31,7 @@ _ssl$(SUFFIX): $(SSL_SOURCE) $(SSL_LIB_DIR)/libeay32.lib $(SSL_LIB_DIR)/ssleay32 ...@@ -31,7 +31,7 @@ _ssl$(SUFFIX): $(SSL_SOURCE) $(SSL_LIB_DIR)/libeay32.lib $(SSL_LIB_DIR)/ssleay32
_hashlib$(SUFFIX): $(HASH_SOURCE) $(SSL_LIB_DIR)/libeay32.lib ../PC/*.h ../Include/*.h _hashlib$(SUFFIX): $(HASH_SOURCE) $(SSL_LIB_DIR)/libeay32.lib ../PC/*.h ../Include/*.h
@if not exist "$(TEMP)/_hashlib/." mkdir "$(TEMP)/_hashlib" @if not exist "$(TEMP)/_hashlib/." mkdir "$(TEMP)/_hashlib"
cl /nologo /c $(HASH_SOURCE) $(CFLAGS) /Fo$(TEMP)\_hashlib\$*.obj $(INCLUDES) cl /nologo /c $(HASH_SOURCE) $(CFLAGS) $(EXTRA_CFLAGS) /Fo$(TEMP)\_hashlib\$*.obj $(INCLUDES)
link /nologo @<< link /nologo @<<
/dll /out:_hashlib$(SUFFIX) $(HASH_LIBS) $(TEMP)\_hashlib\$*.obj /dll /out:_hashlib$(SUFFIX) $(HASH_LIBS) $(TEMP)\_hashlib\$*.obj
<< <<
PCbuild/build_ssl.py
Dosyayı görüntüle @ 9f6ce2b2
...@@ -169,6 +169,8 @@ def main(): ...@@ -169,6 +169,8 @@ def main():
defs = "SSL_DIR=\"%s\"" % (ssl_dir,) defs = "SSL_DIR=\"%s\"" % (ssl_dir,)
if debug: if debug:
defs = defs + " " + "DEBUG=1" defs = defs + " " + "DEBUG=1"
if arch in ('amd64', 'ia64'):
defs = defs + " EXTRA_CFLAGS=/GS-"
makeCommand = 'nmake /nologo -f _ssl.mak ' + defs + " " + make_flags makeCommand = 'nmake /nologo -f _ssl.mak ' + defs + " " + make_flags
print "Executing:", makeCommand print "Executing:", makeCommand
sys.stdout.flush() sys.stdout.flush()
......
PCbuild/pyexpat.vcproj
Dosyayı görüntüle @ 9f6ce2b2
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_OPTERON" AdditionalOptions=" /USECL:MS_OPTERON /GS-"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat" AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
......
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