diff options
| author | ncshaw <ncshaw@ibm.com> | 2021-12-17 13:46:53 -0500 |
|---|---|---|
| committer | Nick Vatamaniuc <nickva@users.noreply.github.com> | 2021-12-17 16:58:27 -0500 |
| commit | 7f63d938d001321cd047a2c7ac1f2822eddf1e1f (patch) | |
| tree | 9db18b25953586d0aea61fb53a967478f361bdb5 | |
| parent | 8cc41b3f24ac0d15a21380b24ffa9b6dba91b3a8 (diff) | |
| download | couchdb-7f63d938d001321cd047a2c7ac1f2822eddf1e1f.tar.gz | |
Remove ERL_OPTS
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | Makefile.win | 2 | ||||
| -rw-r--r-- | rebar.config.script | 7 |
3 files changed, 3 insertions, 8 deletions
@@ -116,7 +116,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 87db5952f..d049c613f 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 5cd6a7208..fdbc194bf 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -186,18 +186,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, "21|22|23|24"}, {deps_dir, "src"}, {deps, lists:map(MakeDep, DepDescs ++ OptionalDeps)}, {sub_dirs, SubDirs}, {lib_dirs, ["src"]}, - {erl_opts, [{i, "../"} | ErlOpts]}, + {erl_opts, [{i, "../"}]}, {eunit_opts, [verbose, {report,{eunit_surefire,[{dir,"."}]}}]}, {plugins, [eunit_plugin]}, {dialyzer, [ |