From 574f9bbda50207919ad93f90a6df6d543f4702ef Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Thu, 3 Sep 2020 15:21:10 +0200 Subject: [PATCH] Trigger -output-complete-exe on -custom with an environment variable --- ...omplete-exe-on-custom-with-an-enviro.patch | 36 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 37 insertions(+) create mode 100644 debian/patches/0007-Trigger-output-complete-exe-on-custom-with-an-enviro.patch diff --git a/debian/patches/0007-Trigger-output-complete-exe-on-custom-with-an-enviro.patch b/debian/patches/0007-Trigger-output-complete-exe-on-custom-with-an-enviro.patch new file mode 100644 index 00000000..3d7c0131 --- /dev/null +++ b/debian/patches/0007-Trigger-output-complete-exe-on-custom-with-an-enviro.patch @@ -0,0 +1,36 @@ +From: Stephane Glondu +Date: Thu, 3 Sep 2020 15:21:10 +0200 +Subject: Trigger -output-complete-exe on -custom with an environment variable + +--- + driver/main_args.ml | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/driver/main_args.ml b/driver/main_args.ml +index 5c28ded..81f203d 100644 +--- a/driver/main_args.ml ++++ b/driver/main_args.ml +@@ -1962,7 +1962,6 @@ third-party libraries such as Lwt, but with a different API." + include Core + include Compiler + let _compat_32 = set bytecode_compatible_32 +- let _custom = set custom_runtime + let _dcamlprimc = set keep_camlprimc_file + let _dinstr = set dump_instr + let _dllib s = defer (ProcessDLLs (Misc.rev_split_words s)) +@@ -1981,6 +1980,15 @@ third-party libraries such as Lwt, but with a different API." + let _use_runtime s = use_runtime := s + let _v () = print_version_and_library "compiler" + let _vmthread () = fatal vmthread_removed_message ++ let _custom () = ++ if ++ match Sys.getenv_opt "OCAML_CUSTOM_USE_OUTPUT_COMPLETE_EXE" with ++ | None | Some "" -> false ++ | Some _ -> true ++ then ++ _output_complete_exe () ++ else ++ set custom_runtime () + end + + end diff --git a/debian/patches/series b/debian/patches/series index 138f0ddd..b5479518 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 0004-Check-for-definition-of-AT_SECURE-before-using-it.patch 0005-read_main_debug_info-do-not-die-in-custom-executable.patch 0006-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch +0007-Trigger-output-complete-exe-on-custom-with-an-enviro.patch -- 2.30.2