Wrap configure script

Update tests according to ocaml-freestanding wip

Author: Lucas Pluvinage

dune

@@ -8,53 +8,55 @@
   (foreign_stubs 
     (language c) 
     (names caml_z)
-    (flags :standard "-DHAS_GMP" (:include cflags.sxp))
+    (flags :standard (:include cflags.sxp))
   )
   (c_library_flags (:include libs.sxp))
 )
 
-(rule 
- (target conf-gmp-cflags-false) ;  global gmp
- (action (with-stdout-to %{target} (
-   run echo "()"
- )))
+(rule
+ (target Makefile)
+ (deps configure config.guess env)
+ (action (bash "env %{read:env}  ./configure"))
 )
 
 (rule 
- (target conf-gmp-cflags-true) ; self built gmp
- (deps (package gmp))
- (action (with-stdout-to %{target} (
-   bash "echo \"(-I$(dirname %{lib:gmp:META}))\""
- )))
+ (target env)
+ (deps env-%{lib-available:gmp})
+ (action (copy env-%{lib-available:gmp} env)) 
 )
 
 (rule 
- (target cflags.sxp)
- (deps (:cflags conf-gmp-cflags-%{lib-available:gmp}))
- (action (copy %{cflags} cflags.sxp))
-)
-
-
-(rule 
- (target conf-gmp-lib-false) ; global gmp
+ (target env-false)
  (action (with-stdout-to %{target} (
-   run echo "(-lgmp)"
+   bash "echo -n CC=\\\"%{ocaml-config:c_compiler}\\\" CFLAGS=\\\"%{ocaml-config:ocamlopt_cflags}\\\""
  )))
 )
-
+  ; bash "echo \"(\\\"-L$(dirname %{lib:gmp:libgmp.so})\\\" -lgmp)\""
 (rule 
- (target conf-gmp-lib-true) ; self built gmp
- (deps (package gmp))
+ (target env-true)
  (action (with-stdout-to %{target} (
-   bash "echo \"(\\\"-L$(dirname %{lib:gmp:libgmp.so})\\\" -lgmp)\""
+   bash "echo -n CC=\\\"%{ocaml-config:c_compiler}\\\" LDFLAGS=\\\"-L$(realpath $(dirname %{lib:gmp:libgmp.a}))\\\" CFLAGS=\\\"%{ocaml-config:ocamlopt_cflags}\\\" CPPFLAGS=\\\"-I$(realpath $(dirname %{lib:gmp:libgmp.a}))\\\""
  )))
 )
 
+(rule
+ (target cflags.sxp)
+ (deps Makefile)
+ (action (with-stdout-to %{target} (progn 
+  (bash "echo -n '('")
+  (bash "cat Makefile | sed -n -e 's/CFLAGS=//p'")
+  (bash "echo -n ')'")
+))))
+
 (rule
  (target libs.sxp)
- (deps (:lib conf-gmp-lib-%{lib-available:gmp}))
- (action (copy %{lib} libs.sxp))
-)
+ (deps Makefile)
+ (action (with-stdout-to %{target} (progn 
+  (bash "echo -n '('")
+  (bash "cat Makefile | sed -n -e 's/LIBS=//p'")
+  (bash "echo -n ')'")
+))))
+
 
 (rule 
  (deps META)

tests/dune

@@ -49,7 +49,7 @@ int solo5_app_main(const struct solo5_start_info *si) {
  (name zq_freestanding)
  (modules zq_freestanding)
  (libraries zarith)
- (modes (native object))
+ (link_flags :standard -cclib --solo5-abi=spt)
  (foreign_stubs (language c) (names startup manifest))
 )
 
@@ -60,27 +60,11 @@ int solo5_app_main(const struct solo5_start_info *si) {
  (action
   (run solo5-elftool gen-manifest manifest.json manifest.c)))
 
-(rule
- (enabled_if (= %{context_name} freestanding))
- (target ldflags)
- (action (with-stdout-to %{target} (progn
-  (bash "solo5-config --target=spt --ldflags")
- )))
-)
-
-(rule
- (enabled_if (= %{context_name} freestanding))
- (target zq.out)
- (deps zq_freestanding.exe.o)
- (action
-  (bash
-   "$(solo5-config --target=spt --ld) zq_freestanding.exe.o -o %{target} %{ocaml-config:native_c_libraries} %{read:ldflags}")))
-
 ; Run solo5 code
 (rule 
  (enabled_if (= %{context_name} freestanding))
- (deps zq.out)
- (action (with-accepted-exit-codes 1 (with-stdout-to zq.output.full (run solo5-spt zq.out))))
+ (deps zq_freestanding.exe)
+ (action (with-accepted-exit-codes 1 (with-stdout-to zq.output.full (run solo5-spt zq_freestanding.exe))))
 )
 
 ; Remove solo5 intro