diff options
| author | Maxime Dénès | 2017-12-14 17:23:13 +0100 |
|---|---|---|
| committer | Maxime Dénès | 2017-12-14 17:23:13 +0100 |
| commit | 1853470c78d1a8aa2525dd57bbfce1064d359ff2 (patch) | |
| tree | d0af37b803fd6113e9fdc12f37501af3c8eba7ae /kernel | |
| parent | 84e570d7c532f16104157b806da714906fdf26b3 (diff) | |
| parent | 4554a860ffdcb30bf5711bd52f443484f9f950d9 (diff) | |
Merge PR #6264: [kernel] Patch allowing to disable VM reduction.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/nativeconv.ml | 2 | ||||
| -rw-r--r-- | kernel/safe_typing.ml | 2 | ||||
| -rw-r--r-- | kernel/vconv.ml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kernel/nativeconv.ml b/kernel/nativeconv.ml index a62a079da9..9f9102f7d2 100644 --- a/kernel/nativeconv.ml +++ b/kernel/nativeconv.ml @@ -154,7 +154,7 @@ let warn_no_native_compiler = (* Wrapper for [native_conv] above *) let native_conv cv_pb sigma env t1 t2 = - if Coq_config.no_native_compiler then begin + if not Coq_config.native_compiler then begin warn_no_native_compiler (); vm_conv cv_pb env t1 t2 end diff --git a/kernel/safe_typing.ml b/kernel/safe_typing.ml index 0e41bfc3c4..5150ad4113 100644 --- a/kernel/safe_typing.ml +++ b/kernel/safe_typing.ml @@ -858,7 +858,7 @@ let export ?except senv dir = } in let ast, symbols = - if !Flags.native_compiler then + if !Flags.output_native_objects then Nativelibrary.dump_library mp dir senv.env str else [], Nativecode.empty_symbols in diff --git a/kernel/vconv.ml b/kernel/vconv.ml index 578a893718..3ef297b1f4 100644 --- a/kernel/vconv.ml +++ b/kernel/vconv.ml @@ -204,4 +204,4 @@ let vm_conv cv_pb env t1 t2 = let univs = (univs, checked_universes) in let _ = vm_conv_gen cv_pb env univs t1 t2 in () -let _ = Reduction.set_vm_conv vm_conv +let _ = if Coq_config.bytecode_compiler then Reduction.set_vm_conv vm_conv |