Merge pull request #10225 from EduardoRFS/fix-dune-build

trefis · trefis · commit 091bff3376d2 · 2021-04-19T10:27:33.000+02:00
diff --git a/dune b/dune
@@ -93,7 +93,7 @@
     bytegen bytelibrarian bytelink bytepackager emitcode printinstr
 
     ;; driver/
-    errors compile
+    errors compile maindriver
  ))
 
 (library
@@ -165,7 +165,7 @@
    compute_ranges
 
    ;; driver/
-   optcompile opterrors
+   optcompile opterrors optmaindriver
  )
 )
 
diff --git a/ocamltest/dune b/ocamltest/dune
@@ -29,8 +29,7 @@
    ../Makefile.common
    ../Makefile.best_binaries
    Makefile
-   ./ocamltest_config.ml.in
-   ./getocamloptdefaultflags)
+   ./ocamltest_config.ml.in)
  (action (run make %{targets} COMPUTE_DEPS=false)))
 
 ;; FIXME: handle UNIX_OR_WIN32 or something similar
diff --git a/runtime/dune b/runtime/dune
@@ -60,6 +60,7 @@
   (wrapped false)
   (modules runtime)
   (flags (-nostdlib -nopervasives))
+  (library_flags -cclib "-I runtime")
   (self_build_stubs_archive (runtime)))
 
 (rule

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@`
`93`	`93`	`bytegen bytelibrarian bytelink bytepackager emitcode printinstr`
`94`	`94`
`95`	`95`	`;; driver/`
`96`		`- errors compile`
	`96`	`+ errors compile maindriver`
`97`	`97`	`))`
`98`	`98`
`99`	`99`	`(library`
`@@ -165,7 +165,7 @@`
`165`	`165`	`compute_ranges`
`166`	`166`
`167`	`167`	`;; driver/`
`168`		`- optcompile opterrors`
	`168`	`+ optcompile opterrors optmaindriver`
`169`	`169`	`)`
`170`	`170`	`)`
`171`	`171`