From 7a6f02ec6a30ae37432bb5c6eaa775b1780a67f9 Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Wed, 25 Nov 2020 15:31:08 +0000 Subject: Link DLLs with -static-libgcc on mingw-w64 i686 This has become necessary with version 8.0.0 of the mingw-w64 runtime which causes libgcc_s_sjlj-1.dll to be linked with all DLLs, It does not appear to be doing this for executables, which means that executables using C++ should still be able to operate as before (in particular, ocaml-mccs). --- Makefile.build_config.in | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Makefile.build_config.in') diff --git a/Makefile.build_config.in b/Makefile.build_config.in index fa6b2b71e3..49a3f14c0c 100644 --- a/Makefile.build_config.in +++ b/Makefile.build_config.in @@ -27,3 +27,7 @@ INSTALL_PROG ?= @INSTALL_PROGRAM@ # The command to generate C dependency information DEP_CC=@DEP_CC@ -MM COMPUTE_DEPS=@compute_deps@ + +# This is munged into utils/config.ml, not overridable by other parts of +# the build system. +OC_DLL_LDFLAGS=@oc_dll_ldflags@ -- cgit v1.2.1