flambda-backend: To upstream: fix to Ocaml_modifiers in ocamltest

mshinwell · poechsel · commit 71a03ef00beb · 2021-06-25T16:18:48.000+01:00
diff --git a/ocamltest/.depend b/ocamltest/.depend
@@ -258,14 +258,14 @@ ocaml_flags.cmi : \
     environments.cmi
 ocaml_modifiers.cmo : \
     ocamltest_stdlib.cmi \
-    ocamltest_config.cmi \
     ocaml_variables.cmi \
+    ocaml_directories.cmi \
     environments.cmi \
     ocaml_modifiers.cmi
 ocaml_modifiers.cmx : \
     ocamltest_stdlib.cmx \
-    ocamltest_config.cmx \
     ocaml_variables.cmx \
+    ocaml_directories.cmx \
     environments.cmx \
     ocaml_modifiers.cmi
 ocaml_modifiers.cmi : \
diff --git a/ocamltest/Makefile b/ocamltest/Makefile
@@ -129,8 +129,8 @@ ocaml_plugin := \
   ocaml_backends.mli ocaml_backends.ml \
   ocaml_filetypes.mli ocaml_filetypes.ml \
   ocaml_variables.mli ocaml_variables.ml \
-  ocaml_modifiers.mli ocaml_modifiers.ml \
   ocaml_directories.mli ocaml_directories.ml \
+  ocaml_modifiers.mli ocaml_modifiers.ml \
   ocaml_files.mli ocaml_files.ml \
   ocaml_flags.mli ocaml_flags.ml \
   ocaml_commands.mli ocaml_commands.ml \
diff --git a/ocamltest/ocaml_modifiers.ml b/ocamltest/ocaml_modifiers.ml
@@ -68,7 +68,8 @@ let make_module_modifier unit_name directory =
 ]
 
 let compiler_subdir subdir =
-  Filename.make_path (Ocamltest_config.ocamlsrcdir :: subdir)
+  (* CR mshinwell: upstream this change *)
+  Filename.make_path (Ocaml_directories.srcdir :: subdir)
 
 let config =
 [

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@ let make_module_modifier unit_name directory =`
`68`	`68`	`]`
`69`	`69`
`70`	`70`	`let compiler_subdir subdir =`
`71`		`- Filename.make_path (Ocamltest_config.ocamlsrcdir :: subdir)`
	`71`	`+ (* CR mshinwell: upstream this change *)`
	`72`	`+ Filename.make_path (Ocaml_directories.srcdir :: subdir)`
`72`	`73`
`73`	`74`	`let config =`
`74`	`75`	`[`