summaryrefslogtreecommitdiff
path: root/Makefile.build_config.in
diff options
context:
space:
mode:
authorDavid Allsopp <david.allsopp@metastack.com>2020-11-25 15:31:08 +0000
committerDavid Allsopp <david.allsopp@metastack.com>2020-11-25 15:31:08 +0000
commit7a6f02ec6a30ae37432bb5c6eaa775b1780a67f9 (patch)
treed566c6aeb3b79ccbd7bdc08e066f1327f59a1c87 /Makefile.build_config.in
parent10c91b3a8d6a526b847a4d3995b452e568627473 (diff)
downloadocaml-7a6f02ec6a30ae37432bb5c6eaa775b1780a67f9.tar.gz
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).
Diffstat (limited to 'Makefile.build_config.in')
-rw-r--r--Makefile.build_config.in4
1 files changed, 4 insertions, 0 deletions
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@