diff options
| author | Rickard Green <[email protected]> | 2018-09-12 14:41:05 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-09-12 14:41:05 +0200 |
| commit | 6d665a8296999822e4d516343d0e21ed62e70b37 (patch) | |
| tree | 924754f136b6e188163a275a5ffdcf6b7e69f3ff /lib | |
| parent | 72a9c61b043dd12b6871248b6b353b333b1bc30b (diff) | |
| parent | 333e4c5a1406cdeb9d1d5cf9bf4a4fadb232fca8 (diff) | |
| download | otp-6d665a8296999822e4d516343d0e21ed62e70b37.tar.gz otp-6d665a8296999822e4d516343d0e21ed62e70b37.tar.bz2 otp-6d665a8296999822e4d516343d0e21ed62e70b37.zip | |
Merge branch 'maint-21' into maint
* maint-21:
Updated OTP version
Update release notes
Update version numbers
erts: Fix "Prevent inconsistent node lists" fix
Fix include-path regression caused by dd0a39c
Restore default SIGTERM behaviour for port programs
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/compiler/doc/src/notes.xml | 16 | ||||
| -rw-r--r-- | lib/compiler/src/compile.erl | 1 | ||||
| -rw-r--r-- | lib/compiler/vsn.mk | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml index 671126b73b..023e28e702 100644 --- a/lib/compiler/doc/src/notes.xml +++ b/lib/compiler/doc/src/notes.xml @@ -32,6 +32,22 @@ <p>This document describes the changes made to the Compiler application.</p> +<section><title>Compiler 7.2.4</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p>Fix a regression in OTP-15204 that removed + <c>.beam</c> file metadata that some external build tools + relied on.</p> + <p> + Own Id: OTP-15292</p> + </item> + </list> + </section> + +</section> + <section><title>Compiler 7.2.3</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl index e1c1f7338e..562d57a6ef 100644 --- a/lib/compiler/src/compile.erl +++ b/lib/compiler/src/compile.erl @@ -1603,7 +1603,6 @@ effects_code_generation(Option) -> binary -> false; verbose -> false; {cwd,_} -> false; - {i,_} -> false; {outdir, _} -> false; _ -> true end. diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk index 355113a94d..bb6ee00cd7 100644 --- a/lib/compiler/vsn.mk +++ b/lib/compiler/vsn.mk @@ -1 +1 @@ -COMPILER_VSN = 7.2.3 +COMPILER_VSN = 7.2.4 |