From 7b21a0c1fdbda9f44af971a63970194ff25bf84f Mon Sep 17 00:00:00 2001 From: Gabriel Scherer Date: Fri, 22 Feb 2019 11:31:08 +0100 Subject: [PATCH] Revert "add the "link" tag to "pack" actions (fixes #272)" This reverts commit 9cb08c69a7ee0cb1e6041b1e9f6dae8398319391. --- Changes | 7 +++++++ src/ocaml_compiler.ml | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Changes b/Changes index 9ee728c4..1bc4d0cd 100644 --- a/Changes +++ b/Changes @@ -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): --------------------- diff --git a/src/ocaml_compiler.ml b/src/ocaml_compiler.ml index dc8be4c8..b05fe920 100644 --- a/src/ocaml_compiler.ml +++ b/src/ocaml_compiler.ml @@ -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