diff options
| author | Gabriel Scherer <gabriel.scherer@gmail.com> | 2018-02-21 13:30:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-21 13:30:57 +0100 |
| commit | a7ca6cc6abea6552d23cd5f2d62325c1fe6c4dc8 (patch) | |
| tree | 7b8fa3d3e5f157903ecda5cdf6572b825c1003a0 | |
| parent | 175ad5b8a30ace4789e6439501dd8978bfa0ade5 (diff) | |
| parent | 75042a2c647d81b2bc61792d0a48f747b1fa109a (diff) | |
| download | ocaml-a7ca6cc6abea6552d23cd5f2d62325c1fe6c4dc8.tar.gz | |
Merge pull request #1624 from rixed/trunk
Asmlink.reset should also clean lib_ccobjs/lib_ccopts
| -rw-r--r-- | Changes | 3 | ||||
| -rw-r--r-- | asmcomp/asmlink.ml | 4 |
2 files changed, 6 insertions, 1 deletions
@@ -215,6 +215,9 @@ Working version - GPR#1619: expect_test: print all the exceptions, even the unexpected ones (Thomas Refis, review by Jérémie Dimino) +- MPR#7738, GPR#1624: Asmlink.reset also resets lib_ccobjs/ccopts + (Cedric Cellier, review by Gabriel Scherer) + ### Bug fixes - MPR#5250, GPR#1435: on Cygwin, when ocamlrun searches the path diff --git a/asmcomp/asmlink.ml b/asmcomp/asmlink.ml index f99ebd236f..ee35ac69eb 100644 --- a/asmcomp/asmlink.ml +++ b/asmcomp/asmlink.ml @@ -422,4 +422,6 @@ let reset () = implementations_defined := []; cmx_required := []; interfaces := []; - implementations := [] + implementations := []; + lib_ccobjs := []; + lib_ccopts := [] |