Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 71BEB9FBD for ; Thu, 24 May 2012 09:16:51 +0000 (UTC) Received: (qmail 90387 invoked by uid 500); 24 May 2012 09:16:51 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 90325 invoked by uid 500); 24 May 2012 09:16:51 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 90316 invoked by uid 99); 24 May 2012 09:16:51 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 May 2012 09:16:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D669617A45; Thu, 24 May 2012 09:16:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dch@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: COUCHDB-1482 - use correct linker flags to build snappy_nif.dll on Windows Message-Id: <20120524091647.D669617A45@tyr.zones.apache.org> Date: Thu, 24 May 2012 09:16:47 +0000 (UTC) Updated Branches: refs/heads/master 325cee6f4 -> a6eaf9f15 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. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/a6eaf9f1 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/a6eaf9f1 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/a6eaf9f1 Branch: refs/heads/master Commit: a6eaf9f15625ebcd361cd2cf277026a8318e818c Parents: 12fc5ea Author: Dave Cottlehuber Authored: Wed May 23 23:45:55 2012 +0200 Committer: Dave Cottlehuber Committed: Thu May 24 00:38:25 2012 +0200 ---------------------------------------------------------------------- src/snappy/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/a6eaf9f1/src/snappy/Makefile.am ---------------------------------------------------------------------- diff --git a/src/snappy/Makefile.am b/src/snappy/Makefile.am index bca103b..23dbf14 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