From: Jon Turney <jon.turney@dronecode.org.uk>
To: Cygwin Patches <cygwin-patches@cygwin.com>
Subject: Re: [PATCH 2/2] Move source files used in utils/mingw/ into that subdirectory
Date: Tue, 4 May 2021 19:34:51 +0100 [thread overview]
Message-ID: <0d4d3343-45ec-2e25-0985-e99db9b46c01@dronecode.org.uk> (raw)
In-Reply-To: <YI/VCcOj36ydUiEw@calimero.vinschen.de>
On 03/05/2021 11:48, Corinna Vinschen wrote:
> On May 2 16:25, Jon Turney wrote:
>> Move all the source files used in utils/mingw/ into that subdirectory,
>> so the built objects are in the expected place.
>>
>> (path.cc requires some more unpicking, and even then there is genuinely
>> some shared code, so use a trivial file which includes the real path.cc
>> so the object file is generated where expected)
>
> This patchset LGTM, except one thing which isn't your fault:
>
>> index b96ad40c1..a7797600c 100644
>> --- a/winsup/utils/strace.cc
>> +++ b/winsup/utils/mingw/strace.cc
>> @@ -21,11 +21,11 @@ details. */
>> #include <time.h>
>> #include <signal.h>
>> #include <errno.h>
>> -#include "../cygwin/include/sys/strace.h"
>> -#include "../cygwin/include/sys/cygwin.h"
>> -#include "../cygwin/include/cygwin/version.h"
>> -#include "../cygwin/cygtls_padsize.h"
>> -#include "../cygwin/gcc_seh.h"
>> +#include "../../cygwin/include/sys/strace.h"
>> +#include "../../cygwin/include/sys/cygwin.h"
>> +#include "../../cygwin/include/cygwin/version.h"
>> +#include "../../cygwin/cygtls_padsize.h"
>> +#include "../../cygwin/gcc_seh.h"
>
> What about adding -I../../cygwin -I../../cygwin/include to the build
> rules and get rid of the relative paths inside the sources?
That seems fraught as it allows cygwin system headers to be picked up in
preference to mingw ones?
Using '-idirafter' gets you a build, but it would be much more work to
check that you've actually built what you wanted to...
next prev parent reply other threads:[~2021-05-04 18:35 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-02 15:25 [PATCH 0/2] Improve automake object file location for utils/mingw/ Jon Turney
2021-05-02 15:25 ` [PATCH 1/2] Unpick cygpath TESTSUITE Jon Turney
2021-05-02 15:25 ` [PATCH 2/2] Move source files used in utils/mingw/ into that subdirectory Jon Turney
2021-05-03 10:48 ` Corinna Vinschen
2021-05-04 18:34 ` Jon Turney [this message]
2021-05-06 8:43 ` Corinna Vinschen
2021-05-09 15:16 ` Jon Turney
2021-05-10 7:51 ` Corinna Vinschen
2021-05-09 15:09 ` [PATCH 3/2] Get rid of relative include paths in strace.cc Jon Turney
2021-05-10 8:09 ` 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=0d4d3343-45ec-2e25-0985-e99db9b46c01@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).