diff options
author | Pau Ruiz Safont <pau.ruizsafont@cloud.com> | 2023-02-24 20:31:56 +0000 |
---|---|---|
committer | Pau Ruiz Safont <pau.ruizsafont@cloud.com> | 2023-02-24 20:31:56 +0000 |
commit | 69a7cdbc03a200ebd9af8e2bec628c5f9c32610f (patch) | |
tree | 99e0a266e60148c4e844c886e957ef5a0b24a2ad | |
parent | d71ea3d089ae3c338b8b6e2fb7beb08908076c7a (diff) | |
download | ocaml-69a7cdbc03a200ebd9af8e2bec628c5f9c32610f.tar.gz |
dune: enable building @libs target
-rw-r--r-- | ocamltest/dune | 12 | ||||
-rw-r--r-- | otherlibs/unix/dune | 7 | ||||
-rw-r--r-- | utils/dune | 10 |
3 files changed, 4 insertions, 25 deletions
diff --git a/ocamltest/dune b/ocamltest/dune index 518c335959..cb68cc82f3 100644 --- a/ocamltest/dune +++ b/ocamltest/dune @@ -20,18 +20,6 @@ (modules tsl_parser) (mode fallback)) -(rule - (targets ocamltest_config.ml) - (deps - ../Makefile.config - ../Makefile.build_config - ../Makefile.config_if_required - ../Makefile.common - ../Makefile.best_binaries - Makefile - ./ocamltest_config.ml.in) - (action (run make %{targets} COMPUTE_DEPS=false))) - ;; FIXME: handle UNIX_OR_WIN32 or something similar (library (name ocamltest_core_and_plugin) diff --git a/otherlibs/unix/dune b/otherlibs/unix/dune index f60654ac2a..e1498f9b4b 100644 --- a/otherlibs/unix/dune +++ b/otherlibs/unix/dune @@ -33,13 +33,6 @@ wait write)) (rule - (action (copy unix_unix.ml unix.ml)) - (enabled_if (<> %{os_type} "Win32"))) -(rule - (action (copy unix_win32.ml unix.ml)) - (enabled_if (= %{os_type} "Win32"))) - -(rule (action (copy accept_unix.c accept.c)) (enabled_if (<> %{os_type} "Win32"))) (rule (action (copy bind_unix.c bind.c)) (enabled_if (<> %{os_type} "Win32"))) diff --git a/utils/dune b/utils/dune index a9f7629803..ec264d3405 100644 --- a/utils/dune +++ b/utils/dune @@ -15,12 +15,10 @@ (rule (targets config.ml) (mode fallback) - (deps (:mk Makefile) - ../Makefile.config - ; for now the utils Makefile does not use build_config - config.mlp - config.common.ml) - (action (system "make -f %{mk} %{targets}"))) + (deps config.generated.ml config.common.ml) + (action + (with-stdout-to %{targets} + (system "cat %{deps}")))) (rule (targets domainstate.ml) |