diff options
| author | cmaynard <cmaynard@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-04-20 05:21:32 +0000 |
|---|---|---|
| committer | cmaynard <cmaynard@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-04-20 05:21:32 +0000 |
| commit | cf98e3558154f97da9943f1cc9fa5136a6f623f8 (patch) | |
| tree | 847ce312e6b16e786dc7f0750065231e68c41c18 /config.nmake | |
| parent | 7184e0dcd9bd455636105710b288d5d49a222c94 (diff) | |
Only add /SafeSEH to LDFLAGS if WIRESHARK_TARGET_PLATFORM != win64. The
Windows-7-x64 buildbot doesn't like it and reports the following:
LINK : fatal error LNK1246: '/SAFESEH' not compatible with 'x64' target machine; link without '/SAFESEH'
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36730 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config.nmake b/config.nmake index 1edc40ad8b..4f50330ca7 100644 --- a/config.nmake +++ b/config.nmake @@ -850,8 +850,10 @@ DLL_LDFLAGS = /MANIFEST:no # http://msdn.microsoft.com/en-us/magazine/cc337897.aspx !IF $(MSC_VER_REQUIRED) >= 1300 LOCAL_CFLAGS= $(LOCAL_CFLAGS) /GS +!IF "$(WIRESHARK_TARGET_PLATFORM)" != "win64" LOCAL_LDFLAGS= $(LOCAL_LDFLAGS) /SafeSEH !ENDIF +!ENDIF # Enable ASLR. Requires VS2008 or later. # http://blogs.msdn.com/b/vcblog/archive/2009/05/21/dynamicbase-and-nxcompat.aspx |