ocamlopt: do not link -lzstd nor zstd.n.o by default, only for compilerlibs

To this end, we produce a new library libcomprmarsh.a, containing
runtime/zstd.n.o, and attach both -lcomprmarsh and -lzstd to
ocamlcommon.cmxa.

(cherry picked and much improved from commit
 9398511da3ede347ef9d07cc6d5d75fa844ea447)

(cherry picked from commit 6a2e09d)

Author: xavierleroy

Makefile

@@ -414,6 +414,15 @@ beforedepend:: utils/config_main.mli utils/config_boot.mli
 $(addprefix compilerlibs/ocamlcommon., cma cmxa): \
   OC_COMMON_LINKFLAGS += -linkall
 
+COMPRESSED_MARSHALING_FLAGS=-cclib -lcomprmarsh \
+           $(patsubst %, -ccopt %, $(filter-out -l%,$(ZSTD_LIBS))) \
+           $(patsubst %, -cclib %, $(filter -l%,$(ZSTD_LIBS))) \
+
+compilerlibs/ocamlcommon.cmxa: \
+  OC_NATIVE_LINKFLAGS += $(COMPRESSED_MARSHALING_FLAGS)
+
+compilerlibs/ocamlcommon.cmxa: stdlib/libcomprmarsh.$(A)
+
 partialclean::
 	rm -f compilerlibs/ocamlcommon.cma
 
@@ -927,8 +936,6 @@ ocamlc_SOURCES = driver/main.mli driver/main.ml
 
 ocamlc$(EXE): OC_BYTECODE_LINKFLAGS += -compat-32 -g
 
-ocamlc.opt$(EXE): OC_NATIVE_LINKFLAGS += $(addprefix -cclib ,$(BYTECCLIBS))
-
 partialclean::
 	rm -f ocamlc ocamlc.exe ocamlc.opt ocamlc.opt.exe
 
@@ -1133,15 +1140,15 @@ runtime_COMMON_C_SOURCES = \
   sys \
   $(TSAN_NATIVE_RUNTIME_C_SOURCES) \
   $(UNIX_OR_WIN32) \
-  weak \
-  zstd
+  weak
 
 runtime_BYTECODE_ONLY_C_SOURCES = \
   backtrace_byt \
   fail_byt \
   fix_code \
   interp \
-  startup_byt
+  startup_byt \
+  zstd
 runtime_BYTECODE_C_SOURCES = \
   $(runtime_COMMON_C_SOURCES:%=runtime/%.c) \
   $(runtime_BYTECODE_ONLY_C_SOURCES:%=runtime/%.c)
@@ -1172,7 +1179,8 @@ runtime_PROGRAMS = runtime/ocamlrun$(EXE)
 runtime_BYTECODE_STATIC_LIBRARIES = $(addprefix runtime/, \
   ld.conf libcamlrun.$(A))
 runtime_BYTECODE_SHARED_LIBRARIES =
-runtime_NATIVE_STATIC_LIBRARIES = runtime/libasmrun.$(A)
+runtime_NATIVE_STATIC_LIBRARIES = \
+  runtime/libasmrun.$(A) runtime/libcomprmarsh.$(A)
 runtime_NATIVE_SHARED_LIBRARIES =
 
 ifeq "$(RUNTIMED)" "true"
@@ -1223,6 +1231,8 @@ libasmruni_OBJECTS = \
 libasmrunpic_OBJECTS = $(runtime_NATIVE_C_SOURCES:.c=.npic.$(O)) \
   $(runtime_ASM_OBJECTS:.$(O)=_libasmrunpic.$(O))
 
+libcomprmarsh_OBJECTS = runtime/zstd.n.o
+
 ## General (non target-specific) assembler and compiler flags
 
 runtime_CPPFLAGS = -DCAMLDLLIMPORT= -DIN_CAML_RUNTIME
@@ -1339,6 +1349,9 @@ runtime/libasmrun_pic.$(A): $(libasmrunpic_OBJECTS)
 runtime/libasmrun_shared.$(SO): $(libasmrunpic_OBJECTS)
 	$(V_MKDLL)$(MKDLL) -o $@ $^ $(NATIVECCLIBS)
 
+runtime/libcomprmarsh.$(A): $(libcomprmarsh_OBJECTS)
+	$(V_MKLIB)$(call MKLIB,$@, $^)
+
 ## Runtime target-specific preprocessor and compiler flags
 
 runtime/%.$(O): OC_CPPFLAGS += $(runtime_CPPFLAGS)
@@ -1495,9 +1508,12 @@ runtimeopt: stdlib/libasmrun.$(A)
 makeruntimeopt: runtime-allopt
 stdlib/libasmrun.$(A): runtime-allopt
 	cd stdlib; $(LN) ../runtime/libasmrun.$(A) .
+stdlib/libcomprmarsh.$(A): runtime/libcomprmarsh.$(A)
+	cd stdlib; $(LN) ../runtime/libcomprmarsh.$(A) .
 
 clean::
 	rm -f stdlib/libasmrun.a stdlib/libasmrun.lib
+	rm -f stdlib/libcomprmarsh.a stdlib/libcomprmarsh.lib
 
 # Dependencies
 

Makefile.config.in

@@ -173,7 +173,8 @@ CPPFLAGS=@CPPFLAGS@
 OCAMLC_CFLAGS=@ocamlc_cflags@
 
 OCAMLC_CPPFLAGS=@ocamlc_cppflags@
-BYTECCLIBS=@cclibs@
+ZSTD_LIBS=@zstd_libs@
+BYTECCLIBS=@zstd_libs@ @cclibs@
 EXE=@exeext@
 OUTPUTEXE=@outputexe@$(EMPTY)
 SUPPORTS_SHARED_LIBRARIES=@supports_shared_libraries@

configure

@@ -167,6 +167,7 @@ AC_SUBST([oc_dll_ldflags])
 AC_SUBST([oc_exe_ldflags])
 AC_SUBST([cclibs])
 AC_SUBST([native_ldflags])
+AC_SUBST([zstd_libs])
 AC_SUBST([ocamlc_cflags])
 AC_SUBST([ocamlc_cppflags])
 AC_SUBST([flexdll_source_dir])
@@ -2144,6 +2145,8 @@ AC_PATH_TOOL([PKG_CONFIG], [pkg-config], [false])
 ## ZSTD compression library
 
 zstd_status=""
+zstd_libs=""
+
 AS_IF([test x"$with_zstd" != "xno"],
   # Try pkg-config first, as it gives the most reliable results
   AS_IF([${PKG_CONFIG} libzstd 2>/dev/null],
@@ -2166,7 +2169,6 @@ AS_IF([test x"$with_zstd" != "xno"],
 
 AS_IF([test x"$zstd_status" = "xok"],
   [AC_MSG_NOTICE([compressed compilation artefacts supported])
-   cclibs="$cclibs $zstd_libs"
    internal_cppflags="$internal_cppflags $zstd_flags"
    AC_DEFINE([HAS_ZSTD])],
   [AS_CASE(["$with_zstd"],

configure.ac

@@ -82,7 +82,7 @@ let exe = {@QS@|@exeext@|@QS@}
 let mkdll = {@QS@|@mkdll_exp@|@QS@}
 let mkexe = {@QS@|@mkexe_exp@|@QS@}
 
-let bytecc_libs = {@QS@|@cclibs@|@QS@}
+let bytecc_libs = {@QS@|@zstd_libs@ @cclibs@|@QS@}
 
 let nativecc_libs = {@QS@|@cclibs@|@QS@}
 

ocamltest/ocamltest_config.ml.in

@@ -33,7 +33,7 @@ let ocamlc_cppflags = {@QS@|@ocamlc_cppflags@|@QS@}
           the two drivers should be identical. *)
 let ocamlopt_cflags = {@QS@|@ocamlc_cflags@|@QS@}
 let ocamlopt_cppflags = {@QS@|@ocamlc_cppflags@|@QS@}
-let bytecomp_c_libraries = {@QS@|@cclibs@|@QS@}
+let bytecomp_c_libraries = {@QS@|@zstd_libs@ @cclibs@|@QS@}
 (* bytecomp_c_compiler and native_c_compiler have been supported for a
    long time and are retained for backwards compatibility.
    For programs that don't need compatibility with older OCaml releases