Repository: couchdb-couch Updated Branches: refs/heads/master d95005d43 -> bd00fa9ab
Fixing a build for Mac OS 10.10 - missing mozjs185. Added /usr/local/lib to linker search path because couchdb suggests using homebrew to install dependancies and that's where they are put by default. COUCHDB-2699 Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/bd00fa9a Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/bd00fa9a Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/bd00fa9a Branch: refs/heads/master Commit: bd00fa9ab7e6554b1d579b0ff9d24ed1ff62eda3 Parents: d95005d Author: Artur Mazurek <[email protected]> Authored: Sat May 23 15:13:38 2015 +0100 Committer: Jan Lehnardt <[email protected]> Committed: Tue May 26 22:00:05 2015 +0200 ---------------------------------------------------------------------- rebar.config.script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/bd00fa9a/rebar.config.script ---------------------------------------------------------------------- diff --git a/rebar.config.script b/rebar.config.script index 09e11ad..34e645c 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -81,7 +81,7 @@ CompareSrc = ["priv/couch_ejson_compare/*.c"], BaseSpecs = [ %% couchjs - {"darwin", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ "-DXP_UNIX -I/usr/local/include/js"}, {"LDFLAGS", JS_LDFLAGS}]}]}, + {"darwin", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ "-DXP_UNIX -I/usr/local/include/js"}, {"LDFLAGS", JS_LDFLAGS ++ " -L/usr/local/lib"}]}]}, {"linux", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ "-DXP_UNIX -I/usr/include/js"}, {"LDFLAGS", JS_LDFLAGS ++ " -lm"}]}]}, {"bsd", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ "-DXP_UNIX -I/usr/local/include/js"}, {"LDFLAGS", JS_LDFLAGS ++ " -L/usr/local/lib -lm"}]}]}, {"win32", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ "-DXP_WIN -I/usr/include/js"}, {"LDFLAGS", JS_LDFLAGS}]}]},
