flambda-backend: To upstream: export-dynamic for otherlibs/dynlink/ v…

…ia the natdynlinkops files (still needs .gitignore + way of generating these files)
chambart · Jun 25, 2021 · 93785e3 · 93785e3
1 parent 63db8c1
commit 93785e3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -264,3 +264,8 @@ _build
 /yacc/ocamlyacc
 /yacc/version.h
 /yacc/.gdb_history
+
+/otherlibs/dynlink/natdynlinkops
+/otherlibs/dynlink/natdynlinkops1
+/otherlibs/dynlink/natdynlinkops2
+
diff --git a/otherlibs/dynlink/dune b/otherlibs/dynlink/dune
@@ -209,13 +209,13 @@
 (rule
   (targets dynlink.cma)
   (deps dynlink_internal.cma)
-  ;; XXX the -Wl,-E is Linux-specific
   (action
     (run %{ocamlc}
       -nostdlib
       -g -a
+      %{read:natdynlinkops1}
+      %{read:natdynlinkops2}
       -o dynlink.cma
-      -ccopt -Wl,-E
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Binutils.cmo
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Local_store.cmo
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Build_path_prefix_map.cmo
@@ -271,13 +271,13 @@
 (rule
   (targets dynlink.cmxa dynlink.a)
   (deps dynlink_internal.cmxa)
-  ;; XXX the -Wl,-E is Linux-specific
   (action
     (run %{ocamlopt}
       -nostdlib
       -g -a
+      %{read:natdynlinkops1}
+      %{read:natdynlinkops2}
       -o dynlink.cmxa
-      -ccopt -Wl,-E
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Binutils.cmx
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Local_store.cmx
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Build_path_prefix_map.cmx