You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2012/04/23 20:41:57 UTC

svn commit: r1329368 - /subversion/trunk/build/generator/templates/build_zlib.ezt

Author: rhuijben
Date: Mon Apr 23 18:41:57 2012
New Revision: 1329368

URL: http://svn.apache.org/viewvc?rev=1329368&view=rev
Log:
* generator/templates/build_zlib.ezt
  Pass the -safeseh flag to MASM, to allow the Visual C++ compiler to add
  a safe exception handler table to our result dll and/or executable.
  Every module that isn't compatible automatically removes the table from
  the final module and this removes two incompatible modules from our build.

Modified:
    subversion/trunk/build/generator/templates/build_zlib.ezt

Modified: subversion/trunk/build/generator/templates/build_zlib.ezt
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/build_zlib.ezt?rev=1329368&r1=1329367&r2=1329368&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/build_zlib.ezt (original)
+++ subversion/trunk/build/generator/templates/build_zlib.ezt Mon Apr 23 18:41:57 2012
@@ -55,7 +55,7 @@ set OBJA=contrib\masmx86\gvmat32c.obj co
 set ASM_OPTS=ASFLAGS="%ASFLAGS%" LOC="%LOC%" OBJA="%OBJA%"
 [else]
 if /i "%2" == "Win32" (
-  set ASM_OPTS=LOC="-DASMV -DASMINF" OBJA="inffas32.obj match686.obj"
+  set ASM_OPTS=LOC="-DASMV -DASMINF" OBJA="inffas32.obj match686.obj" "AS=ml -safeseh"
 ) else if /i "%2" == "x64" (
   set ASM_OPTS=LOC="-DASMV -DASMINF" OBJA="inffasx64.obj gvmat64.obj inffas8664.obj" AS=ml64 
 )