summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Allsopp <david.allsopp@metastack.com>2020-11-20 18:44:01 +0000
committerDavid Allsopp <david.allsopp@metastack.com>2020-11-24 13:37:27 +0000
commitcc4946008f7b9d5769d1cac7c9d05afffc87f896 (patch)
tree7cb49c556dae34c9f94a387a2d26faf0360a1703
parent42da838c763c5617a477012720ed070e27e489af (diff)
downloadocaml-cc4946008f7b9d5769d1cac7c9d05afffc87f896.tar.gz
Expose ${cc} in ocamltest
-rw-r--r--ocamltest/ocaml_actions.ml1
-rw-r--r--ocamltest/ocaml_variables.ml3
-rw-r--r--ocamltest/ocaml_variables.mli2
3 files changed, 6 insertions, 0 deletions
diff --git a/ocamltest/ocaml_actions.ml b/ocamltest/ocaml_actions.ml
index 9b8419b825..bd7e6a5ef5 100644
--- a/ocamltest/ocaml_actions.ml
+++ b/ocamltest/ocaml_actions.ml
@@ -1083,6 +1083,7 @@ let config_variables _log env =
Sys.getenv_with_default_value "MKDLL" Ocamltest_config.mkdll;
Ocaml_variables.mkexe, Ocamltest_config.mkexe;
Ocaml_variables.c_preprocessor, Ocamltest_config.c_preprocessor;
+ Ocaml_variables.cc, Ocamltest_config.cc;
Ocaml_variables.csc, Ocamltest_config.csc;
Ocaml_variables.csc_flags, Ocamltest_config.csc_flags;
Ocaml_variables.shared_library_cflags,
diff --git a/ocamltest/ocaml_variables.ml b/ocamltest/ocaml_variables.ml
index b951562917..78c138ef90 100644
--- a/ocamltest/ocaml_variables.ml
+++ b/ocamltest/ocaml_variables.ml
@@ -41,6 +41,9 @@ let bytecc_libs = make ("bytecc_libs",
let c_preprocessor = make ("c_preprocessor",
"Command to use to invoke the C preprocessor")
+let cc = make ("cc",
+ "Command to use to invoke the C compiler")
+
let caml_ld_library_path_name = "CAML_LD_LIBRARY_PATH"
let export_caml_ld_library_path value =
diff --git a/ocamltest/ocaml_variables.mli b/ocamltest/ocaml_variables.mli
index 89686de1e8..5487ea2f7a 100644
--- a/ocamltest/ocaml_variables.mli
+++ b/ocamltest/ocaml_variables.mli
@@ -28,6 +28,8 @@ val bytecc_libs : Variables.t
val c_preprocessor : Variables.t
+val cc : Variables.t
+
val caml_ld_library_path : Variables.t
val compare_programs : Variables.t