summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Cottlehuber <dch@apache.org>2012-05-23 23:45:55 +0200
committerDave Cottlehuber <dch@apache.org>2012-05-24 00:26:23 +0200
commit51000fd9c2dd83c38a85a6e0e1f0a79f0ebe6e1f (patch)
treea512672bbb77ae89059e90730090d586bb2c61b4
parent3b0d6c284fd21cbf67e149a5b23e188076957d40 (diff)
downloadcouchdb-51000fd9c2dd83c38a85a6e0e1f0a79f0ebe6e1f.tar.gz
COUCHDB-1482 - use correct linker flags to build snappy_nif.dll on Windows
- Windows 2008 Server enforces stricter requirements on C runtime dependencies than non-server versions - Erlang/OTP cc.sh and ld.sh build scripts mix release and debug runtime dependencies in in some circumstances - this prevents loading the NIF from loading at all - adding optimisation flags ensures the OTP build does the right thing Thanks Nick North for identifying this bug.
-rw-r--r--src/snappy/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/snappy/Makefile.am b/src/snappy/Makefile.am
index bca103bef..23dbf1472 100644
--- a/src/snappy/Makefile.am
+++ b/src/snappy/Makefile.am
@@ -56,7 +56,7 @@ snappy_nif_la_LDFLAGS = -module -avoid-version
if WINDOWS
snappy_nif_la_LDFLAGS += -no-undefined
-snappy_nif_la_CXXFLAGS += -EHsc
+snappy_nif_la_CXXFLAGS += -EHsc -Ox
SNAPPY_SO_NAME = snappy_nif.dll
else
SNAPPY_SO_NAME = snappy_nif.so