6365cf1bc0
This corresponds to https://github.com/msys2/msys2-runtime/pull/313 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
From 65ae61ddc90544b6a34c8377e227c0df014fcf07 Mon Sep 17 00:00:00 2001
|
|
From: Christoph Reiter <reiter.christoph@gmail.com>
|
|
Date: Sat, 17 Dec 2022 20:14:49 +0100
|
|
Subject: [PATCH 35/N] Revert "Cygwin: Enable dynamicbase on the Cygwin DLL by
|
|
default"
|
|
|
|
This reverts commit 943433b00cacdde0cb9507d0178770a2fb67bd71.
|
|
|
|
This seems to fix fork errors under Docker, see
|
|
https://cygwin.com/pipermail/cygwin/2022-December/252711.html
|
|
---
|
|
winsup/cygwin/Makefile.am | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am
|
|
index 9c09fc2..140e01a 100644
|
|
--- a/winsup/cygwin/Makefile.am
|
|
+++ b/winsup/cygwin/Makefile.am
|
|
@@ -605,8 +605,7 @@ $(NEW_DLL_NAME): $(LDSCRIPT) libdll.a $(VERSION_OFILES) $(LIBSERVER)\
|
|
$(newlib_build)/libm.a $(newlib_build)/libc.a
|
|
$(AM_V_CXXLD)$(CXX) $(CXXFLAGS) \
|
|
-mno-use-libstdc-wrappers \
|
|
- -Wl,--gc-sections -nostdlib -Wl,-T$(LDSCRIPT) \
|
|
- -Wl,--dynamicbase -static \
|
|
+ -Wl,--gc-sections -nostdlib -Wl,-T$(LDSCRIPT) -static \
|
|
$${SOURCE_DATE_EPOCH:+-Wl,--no-insert-timestamp} \
|
|
-Wl,--heap=0 -Wl,--out-implib,msysdll.a -shared -o $@ \
|
|
-e @DLL_ENTRY@ $(DEF_FILE) \
|