You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by va...@apache.org on 2021/12/17 20:49:42 UTC
[couchdb] branch 3.x updated: Remove ERL_OPTS
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch 3.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git
The following commit(s) were added to refs/heads/3.x by this push:
new 186818c Remove ERL_OPTS
186818c is described below
commit 186818c9f69b08508fdcc9bc42b38108e7508c78
Author: ncshaw <nc...@ibm.com>
AuthorDate: Fri Dec 17 13:39:26 2021 -0500
Remove ERL_OPTS
---
Makefile | 2 +-
Makefile.win | 2 +-
rebar.config.script | 7 +------
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index e3916fc..08113fe 100644
--- a/Makefile
+++ b/Makefile
@@ -118,7 +118,7 @@ help:
.PHONY: couch
-# target: couch - Build CouchDB core, use ERL_OPTS to provide custom compiler's options
+# target: couch - Build CouchDB core, use ERL_COMPILER_OPTIONS to provide custom compiler's options
couch: config.erl
@COUCHDB_VERSION=$(COUCHDB_VERSION) COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) $(REBAR) compile $(COMPILE_OPTS)
@cp src/couch/priv/couchjs bin/
diff --git a/Makefile.win b/Makefile.win
index 62a0a8d..3f42686 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -105,7 +105,7 @@ all: couch fauxton docs
.PHONY: couch
-# target: couch - Build CouchDB core, use ERL_OPTS to provide custom compiler's options
+# target: couch - Build CouchDB core, use ERL_COMPILER_OPTIONS to provide custom compiler's options
couch: config.erl
@set COUCHDB_VERSION=$(COUCHDB_VERSION) && set COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) && $(REBAR) compile $(COMPILE_OPTS)
@copy src\couch\priv\couchjs.exe bin
diff --git a/rebar.config.script b/rebar.config.script
index 9160dfb..47abca0 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -191,18 +191,13 @@ MakeDep = fun
{AppName, ".*", {git, Url, Version}, Options}
end.
-ErlOpts = case os:getenv("ERL_OPTS") of
- false -> [];
- Opts -> [list_to_atom(O) || O <- string:tokens(Opts, ",")]
-end.
-
AddConfig = [
{require_otp_vsn, "20|21|22|23|24"},
{deps_dir, "src"},
{deps, lists:map(MakeDep, DepDescs ++ OptionalDeps)},
{sub_dirs, SubDirs},
{lib_dirs, ["src"]},
- {erl_opts, [{i, "../"}] ++ [{d, 'COUCHDB_ERLANG_VERSION', VerString}] ++ ErlOpts},
+ {erl_opts, [{i, "../"}, {d, 'COUCHDB_ERLANG_VERSION', VerString}]},
{eunit_opts, [verbose, {report,{eunit_surefire,[{dir,"."}]}}]},
{plugins, [eunit_plugin]},
{dialyzer, [