diff options
| author | ncshaw <ncshaw@ibm.com> | 2021-12-17 13:39:26 -0500 |
|---|---|---|
| committer | Nick Vatamaniuc <nickva@users.noreply.github.com> | 2021-12-17 15:49:32 -0500 |
| commit | 186818c9f69b08508fdcc9bc42b38108e7508c78 (patch) | |
| tree | 717621a9db403cfab96e6a869876cf00c1f97353 | |
| parent | 7487606e1f0eb6a12649479cfb2ccb7bcdbcc6fe (diff) | |
| download | couchdb-186818c9f69b08508fdcc9bc42b38108e7508c78.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
@@ -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 62a0a8dec..3f42686e3 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 9160dfbf4..47abca02f 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, [ |