summaryrefslogtreecommitdiff
path: root/ocamltest
diff options
context:
space:
mode:
authorKate <kit.ty.kate@disroot.org>2022-02-01 16:45:10 +0000
committerGitHub <noreply@github.com>2022-02-01 17:45:10 +0100
commit9453a903c818dfef161e0534cbef441b1950625c (patch)
treedc540a1308e85265e3a064e90d835cd3ae1a73e6 /ocamltest
parent57c2fb9d5a8c005ac7bfe8785332487f905f68d6 (diff)
downloadocaml-9453a903c818dfef161e0534cbef441b1950625c.tar.gz
Remove configuration options --disable-force-safe-string and DEFAULT_STRING=unsafe (#10893)
The compiler should behave as previous versions with `force-safe-string` enabled, and reject with an error any explicit setting that would try to deviate from that.
Diffstat (limited to 'ocamltest')
-rw-r--r--ocamltest/Makefile1
-rw-r--r--ocamltest/ocamltest_config.ml.in2
-rw-r--r--ocamltest/ocamltest_config.mli3
3 files changed, 0 insertions, 6 deletions
diff --git a/ocamltest/Makefile b/ocamltest/Makefile
index 4d37423512..53ebb005ca 100644
--- a/ocamltest/Makefile
+++ b/ocamltest/Makefile
@@ -249,7 +249,6 @@ ocamltest_config.ml: ocamltest_config.ml.in Makefile ../Makefile.config
$(call SUBST_STRING,CPP) \
$(call SUBST_STRING,ocamlsrcdir) \
$(call SUBST,FLAMBDA) \
- $(call SUBST,FORCE_SAFE_STRING) \
$(call SUBST,FLAT_FLOAT_ARRAY) \
$(call SUBST,WITH_OCAMLDOC) \
$(call SUBST,WITH_OCAMLDEBUG) \
diff --git a/ocamltest/ocamltest_config.ml.in b/ocamltest/ocamltest_config.ml.in
index db4dd221ad..2f03f01989 100644
--- a/ocamltest/ocamltest_config.ml.in
+++ b/ocamltest/ocamltest_config.ml.in
@@ -52,8 +52,6 @@ let flambda = %%FLAMBDA%%
let ocamlc_default_flags = ""
let ocamlopt_default_flags = ""
-let safe_string = %%FORCE_SAFE_STRING%%
-
let flat_float_array = %%FLAT_FLOAT_ARRAY%%
let ocamldoc = %%WITH_OCAMLDOC%%
diff --git a/ocamltest/ocamltest_config.mli b/ocamltest/ocamltest_config.mli
index 3ce8c9558e..ce9e084bdf 100644
--- a/ocamltest/ocamltest_config.mli
+++ b/ocamltest/ocamltest_config.mli
@@ -73,9 +73,6 @@ val ocamlsrcdir : string
val flambda : bool
(** Whether flambda has been enabled at configure time *)
-val safe_string : bool
-(** Whether the compiler was configured with -safe-string *)
-
val flat_float_array : bool
(* Whether the compiler was configured with -flat-float-array *)