From 1df461d41634d1d1dc330f0aca99921d3fced1fd Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Sat, 20 Apr 2019 15:18:18 +0200
Subject: [build] Select uint63 using `ocamlc -config` variables.

This seems more robust and avoids having another implementation of
`cp`.
---
 kernel/dune | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'kernel/dune')

diff --git a/kernel/dune b/kernel/dune
index 5b23a705ae..4038bf5638 100644
--- a/kernel/dune
+++ b/kernel/dune
@@ -3,7 +3,7 @@
  (synopsis "The Coq Kernel")
  (public_name coq.kernel)
  (wrapped false)
- (modules (:standard \ genOpcodeFiles uint63_x86 uint63_amd64 write_uint63))
+ (modules (:standard \ genOpcodeFiles uint63_i386_31 uint63_amd64_63 write_uint63))
  (libraries lib byterun dynlink))
 
 (executable
@@ -14,15 +14,10 @@
  (targets copcodes.ml)
  (action (with-stdout-to %{targets} (run ./genOpcodeFiles.exe copml))))
 
-(executable
-  (name write_uint63)
-  (modules write_uint63)
-  (libraries unix))
-
 (rule
  (targets uint63.ml)
- (deps (:gen ./write_uint63.exe) uint63_x86.ml uint63_amd64.ml)
- (action (run %{gen})))
+ (deps (:gen-file uint63_%{ocaml-config:architecture}_%{ocaml-config:int_size}.ml))
+ (action (copy# %{gen-file} %{targets})))
 
 (documentation
  (package coq))
-- 
cgit v1.2.3