You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/02/06 18:28:27 UTC
[45/46] couch-collate commit: updated refs/heads/import-rcouch to
8ecdb84
fix couch_collate build with the option icu=static
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-collate/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-collate/commit/b65a3adf
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-collate/tree/b65a3adf
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-collate/diff/b65a3adf
Branch: refs/heads/import-rcouch
Commit: b65a3adfab42d342e13b3f8bad31135f03621712
Parents: 32ffa42
Author: benoitc <be...@apache.org>
Authored: Wed Jan 15 21:19:43 2014 +0100
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Thu Feb 6 11:25:49 2014 -0600
----------------------------------------------------------------------
rebar.config.script | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-collate/blob/b65a3adf/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index fb72cdd..21bb978 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -58,8 +58,8 @@ PortEnv = case {UseSystemIcu, BuildStatic} of
];
{_, true} ->
- CFLAGS = GetFlag("ICU_CFLAGS", "-I.libs/icu/include"),
- LDFLAGS = GetFlag("ICU_LDFLAGS", "-lstdc++ -fPIC " ++
+ CFLAGS = GetFlag1("ICU_CFLAGS", "-I.libs/icu/include"),
+ LDFLAGS = GetFlag1("ICU_LDFLAGS", "-lstdc++ -fPIC " ++
".libs/icu/lib/libicui18n.a " ++
".libs/icu/lib/libicuuc.a " ++
".libs/icu/lib/libicudata.a"),