From: Jon Turney <jon.turney@dronecode.org.uk>
To: cygwin-patches@cygwin.com
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Subject: [PATCH] Cygwin: Makefile: Also make 'cygwin0.dll'
Date: Wed, 21 Dec 2022 15:58:16 +0000 [thread overview]
Message-ID: <20221221155816.42959-1-jon.turney@dronecode.org.uk> (raw)
In-Reply-To: <20221221134907.40359-1-jon.turney@dronecode.org.uk>
Hard-link the new DLL with the name 'cygwin0.dll', as that's what the
testsuite expects. (Must be a hardlink as the Windows loader needs to be
able to traverse the link).
Fixes: 90236c3a2cf6 ("Cygwin: Makefile: build new-cygwin1.dll in a single step")
---
winsup/cygwin/Makefile.am | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am
index 0200f6e2a..5ea962ccd 100644
--- a/winsup/cygwin/Makefile.am
+++ b/winsup/cygwin/Makefile.am
@@ -41,6 +41,7 @@ toolincludedir=$(tooldir)/include
DLL_NAME=cygwin1.dll
NEW_DLL_NAME=new-cygwin1.dll
+TEST_DLL_NAME=cygwin0.dll
DEF_FILE=cygwin.def
LIB_NAME=libcygwin.a
TEST_LIB_NAME=libcygwin0.a
@@ -622,6 +623,9 @@ $(LIB_NAME): $(DEF_FILE) $(LIBCOS) | $(NEW_DLL_NAME)
$(TEST_LIB_NAME): $(LIB_NAME)
$(AM_V_GEN)perl -p -e 'BEGIN{binmode(STDIN); binmode(STDOUT);}; s/cygwin1/cygwin0/g' < $? > $@
+$(TEST_DLL_NAME): $(NEW_DLL_NAME)
+ $(AM_V_GEN)ln -f $(NEW_DLL_NAME) $(TEST_DLL_NAME)
+
# sublibs
# import libraries for some subset of symbols indicated by given objects
speclib=\
@@ -664,7 +668,7 @@ libssp.a: $(LIB_NAME) $(wildcard $(newlib_build)/libc/ssp/*.o)
# all
#
-all-local: $(LIB_NAME) $(TEST_LIB_NAME) $(SUBLIBS)
+all-local: $(LIB_NAME) $(TEST_LIB_NAME) $(TEST_DLL_NAME) $(SUBLIBS)
#
# clean
--
2.39.0
next prev parent reply other threads:[~2022-12-21 15:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-21 13:49 [PATCH] Cygwin: Makefile: Build new DLL with the name 'cygwin0.dll' Jon Turney
2022-12-21 15:58 ` Jon Turney [this message]
2022-12-21 16:18 ` [PATCH] Cygwin: Makefile: Drop all the "test dll" considerations Jon Turney
2023-01-06 14:38 ` [PATCH] Cygwin: Run testsuite against the just-built DLL Jon Turney
2023-01-09 11:12 ` Corinna Vinschen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221221155816.42959-1-jon.turney@dronecode.org.uk \
--to=jon.turney@dronecode.org.uk \
--cc=cygwin-patches@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).