Skip to content

Commit

Permalink
Revert "add the "link" tag to "pack" actions (fixes ocaml#272)"
Browse files Browse the repository at this point in the history
This reverts commit 9cb08c6.
  • Loading branch information
gasche committed Feb 22, 2019
1 parent b60ad6b commit 7b21a0c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
7 changes: 7 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ of the usual "- ".
NEXT_RELEASE:
-------------

* Revert the change to "pack" handling from 0.13.0 (#272), which turns
out to break compatibility with too many projects. At this point in
the lifetime of ocamlbuild usage, it's more important to keep
building existing projects than to improve the build system for new
projects -- of course the latter is also nice, but not when it
endangers compatibility.
(Gabriel Scherer)

0.13.1 (15 Sep 2018):
---------------------
Expand Down
8 changes: 4 additions & 4 deletions src/ocaml_compiler.ml
Original file line number Diff line number Diff line change
Expand Up @@ -378,26 +378,26 @@ let byte_debug_library_link_mllib = link_from_file byte_debug_library_link_modul

let byte_pack_modules =
pack_modules [("cmo",["cmi"]); ("cmi",[])] "cmo" "cma" "cma" ocamlc_p
(fun tags -> tags++"ocaml"++"link"++"byte"++"pack")
(fun tags -> tags++"ocaml"++"pack"++"byte")

let byte_pack_mlpack = link_from_file byte_pack_modules

let byte_debug_pack_modules =
pack_modules [("d.cmo",["cmi"]); ("cmi",[])] "d.cmo" "d.cma" "d.cma" ocamlc_p
(fun tags -> tags++"ocaml"++"link"++"byte"++"pack"++"debug")
(fun tags -> tags++"ocaml"++"pack"++"byte"++"debug")

let byte_debug_pack_mlpack = link_from_file byte_debug_pack_modules

let native_pack_modules x =
pack_modules [("cmx",["cmi"; !Options.ext_obj]); ("cmi",[])] "cmx" "cmxa" !Options.ext_lib ocamlopt_p
(fun tags -> tags++"ocaml"++"link"++"native"++"pack") x
(fun tags -> tags++"ocaml"++"pack"++"native") x

let native_pack_mlpack = link_from_file native_pack_modules

let native_profile_pack_modules x =
pack_modules [("p.cmx",["cmi"; "p" -.- !Options.ext_obj]); ("cmi",[])] "p.cmx" "p.cmxa"
("p" -.- !Options.ext_lib) ocamlopt_p
(fun tags -> tags++"ocaml"++"link"++"native"++"pack"++"profile") x
(fun tags -> tags++"ocaml"++"pack"++"native"++"profile") x

let native_profile_pack_mlpack = link_from_file native_profile_pack_modules

Expand Down

0 comments on commit 7b21a0c

Please sign in to comment.