summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonin Décimo <antonin@tarides.com>2023-05-15 16:18:54 +0100
committerGitHub <noreply@github.com>2023-05-15 17:18:54 +0200
commit780d018f5593d231ba309fecb6a7dd775ecf7bbe (patch)
treea48497edd432e9e34dfe1a7b327f80bae00c6221
parent088fc769eab02fcc016c296bbe6ea3337d8f680e (diff)
downloadocaml-780d018f5593d231ba309fecb6a7dd775ecf7bbe.tar.gz
Dune build: gen_primitives.sh must be called from the root (#12244)
Also sync the list of dependencies with gen_primitives.
-rw-r--r--runtime/dune15
-rwxr-xr-xruntime/gen_primitives.sh2
2 files changed, 7 insertions, 10 deletions
diff --git a/runtime/dune b/runtime/dune
index e83c6820d3..a4d58b3e26 100644
--- a/runtime/dune
+++ b/runtime/dune
@@ -17,14 +17,13 @@
(mode fallback)
(deps
; matches the line structure of files in gen_primitives.sh
- alloc.c array.c compare.c extern.c floats.c gc_ctrl.c hash.c intern.c
- interp.c ints.c io.c
- lexing.c md5.c meta.c memprof.c obj.c parsing.c signals.c str.c sys.c
- callback.c weak.c
- finalise.c dynlink.c backtrace_byt.c backtrace.c
- afl.c
- bigarray.c runtime_events.c)
- (action (with-stdout-to %{targets} (run %{dep:gen_primitives.sh}))))
+ alloc.c array.c compare.c extern.c floats.c gc_ctrl.c hash.c intern.c interp.c ints.c io.c
+ lexing.c md5.c meta.c memprof.c obj.c parsing.c signals.c str.c sys.c callback.c weak.c
+ finalise.c domain.c platform.c fiber.c memory.c startup_aux.c runtime_events.c sync.c
+ dynlink.c backtrace_byt.c backtrace.c afl.c bigarray.c prng.c)
+ (action
+ (chdir ..
+ (with-stdout-to %{targets} (run %{dep:gen_primitives.sh})))))
(rule
(targets libcamlrun.a)
diff --git a/runtime/gen_primitives.sh b/runtime/gen_primitives.sh
index 109381d30b..767f27651c 100755
--- a/runtime/gen_primitives.sh
+++ b/runtime/gen_primitives.sh
@@ -15,8 +15,6 @@
#* *
#**************************************************************************
-# duplicated from $(ROOTDIR)/runtime/Makefile
-
# #8985: the meaning of character range a-z depends on the locale, so force C
# locale throughout.
export LC_ALL=C