diff options
author | Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2017-02-01 10:36:24 +0100 |
---|---|---|
committer | Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2017-02-01 10:48:25 +0100 |
commit | 568b38e1d599f8bac5adf140f5a114f2871bc436 (patch) | |
tree | f033e92941edde3b4287213c19cb7cd5a0c47f45 /kernel/safe_typing.ml | |
parent | a54dccb53fa8d6c12745b5f7b2c3c993a915b5bd (diff) | |
parent | f5923c2174fbb419397f127af31ab1cd0b223e0a (diff) |
Merge branch 'v8.5' into v8.6
Diffstat (limited to 'kernel/safe_typing.ml')
-rw-r--r-- | kernel/safe_typing.ml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/safe_typing.ml b/kernel/safe_typing.ml index 95d9c75d3..bc1cb63d8 100644 --- a/kernel/safe_typing.ml +++ b/kernel/safe_typing.ml @@ -794,7 +794,10 @@ type compiled_library = { type native_library = Nativecode.global list let get_library_native_symbols senv dir = - DPMap.find dir senv.native_symbols + try DPMap.find dir senv.native_symbols + with Not_found -> CErrors.errorlabstrm "get_library_native_symbols" + Pp.((str "Linker error in the native compiler. Are you using Require inside a nested Module declaration?") ++ fnl () ++ + (str "This use case is not supported, but disabling the native compiler may help.")) (** FIXME: MS: remove?*) let current_modpath senv = senv.modpath |