diff options
author | Björn Gustavsson <bjorn@erlang.org> | 2022-06-29 13:32:01 +0200 |
---|---|---|
committer | Björn Gustavsson <bjorn@erlang.org> | 2022-06-29 13:32:01 +0200 |
commit | 63abc6807d9998e8c44bc86cc673912b539ac397 (patch) | |
tree | 0bcb0efa91edb9408bb502714aad37aa9627b67f /lib/compiler/src | |
parent | ab0ea053e2053eb77c37480cdf82994ac972ebde (diff) | |
parent | 7f51a71aa483d9fa7781043a855040e45286c1ab (diff) | |
download | erlang-63abc6807d9998e8c44bc86cc673912b539ac397.tar.gz |
Merge branch 'maint'
* maint:
make: Allow OTP to be built deterministically
compiler: Make test_lib robust to +deterministic
compiler: Make compiler forward +determinsitic flag to epp
compiler: Make yecc respect +deterministic
compiler: Make leex respect +deterministic
compiler: Make asn1ct_gen respect +deterministic
compiler: Make EPP respect +deterministic
Diffstat (limited to 'lib/compiler/src')
-rw-r--r-- | lib/compiler/src/Makefile | 6 | ||||
-rw-r--r-- | lib/compiler/src/compile.erl | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile index 57c099601d..8b124d138b 100644 --- a/lib/compiler/src/Makefile +++ b/lib/compiler/src/Makefile @@ -138,6 +138,12 @@ ERL_COMPILE_FLAGS += -Werror ERL_COMPILE_FLAGS += +inline +warn_unused_import \ -I../../stdlib/include -I$(EGEN) -W +warn_missing_spec +ifeq ($(ERL_DETERMINISTIC),yes) + DETERMINISM_FLAG = +deterministic +else + DETERMINISM_FLAG = +endif + # ---------------------------------------------------- # Targets # ---------------------------------------------------- diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl index da388e4bce..771be26765 100644 --- a/lib/compiler/src/compile.erl +++ b/lib/compiler/src/compile.erl @@ -1023,6 +1023,7 @@ do_parse_module(DefEncoding, #compile{ifile=File,options=Opts,dir=Dir}=St) -> R = epp:parse_file(File, [{includes,[".",Dir|inc_paths(Opts)]}, {source_name, SourceName}, + {deterministic, member(deterministic, Opts)}, {macros,pre_defs(Opts)}, {default_encoding,DefEncoding}, {location,StartLocation}, |