diff mbox series

mingw: Remove obsolete STMP_FIXINC override from t-cygming

Message ID 20260405004102.3847-3-peter0x44@disroot.org
State New
Headers
Series mingw: Remove obsolete STMP_FIXINC override from t-cygming |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-arm success Build passed
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 success Build passed
linaro-tcwg-bot/tcwg_gcc_check--master-arm success Test passed
linaro-tcwg-bot/tcwg_gcc_check--master-aarch64 success Test passed

Commit Message

Peter Damianov April 5, 2026, 12:41 a.m. UTC 
  The STMP_FIXINC assignment in t-cygming dates back to
r0-48723-g70e5e841b8b931, which introduced the shared cygwin/mingw
makefile fragment and used it to force fixincludes on for those
targets.

That predates r0-63200-g53c7ffe7dd1c28, which made configure default
STMP_FIXINC to stmp-fixinc, so the t-cygming assignment is now
redundant in normal builds.  Once --disable-fixincludes was added by
r13-2319-gbe9dd80f933480, the old override became incorrect as well,
because it forced stmp-fixinc back on for targets using t-cygming.
Configuring for mingw targets with --disable-fixincludes would then
fail with:

make[1]: No rule to make target
'../build-x86_64-pc-linux-gnu/fixincludes/fixinc.sh', needed by 'stmp-fixinc'.
Stop.

Remove the obsolete assignment so the configure-time default is used,
including when honoring an explicit --disable-fixincludes.

gcc/ChangeLog:

	* config/mingw/t-cygming: Remove obsolete STMP_FIXINC
	override.
---

Resubmitting because I forgot to CC anyone on my first submission.

I tested that this fixes the error I was seeing with --disable-fixincludes on
x86_64-w64-mingw32.  There's still more small files left over related to
fixincludes, but I don't think they are worth addressing in this patch (or the
next release). That is probably not specific to mingw at all.

 gcc/config/mingw/t-cygming | 2 --
 1 file changed, 2 deletions(-)

Comments

Jonathan Yong April 5, 2026, 1:15 a.m. UTC | #1 
On 4/5/26 00:41, Peter Damianov wrote:
> The STMP_FIXINC assignment in t-cygming dates back to
> r0-48723-g70e5e841b8b931, which introduced the shared cygwin/mingw
> makefile fragment and used it to force fixincludes on for those
> targets.
> 
> That predates r0-63200-g53c7ffe7dd1c28, which made configure default
> STMP_FIXINC to stmp-fixinc, so the t-cygming assignment is now
> redundant in normal builds.  Once --disable-fixincludes was added by
> r13-2319-gbe9dd80f933480, the old override became incorrect as well,
> because it forced stmp-fixinc back on for targets using t-cygming.
> Configuring for mingw targets with --disable-fixincludes would then
> fail with:
> 
> make[1]: No rule to make target
> '../build-x86_64-pc-linux-gnu/fixincludes/fixinc.sh', needed by 'stmp-fixinc'.
> Stop.
> 
> Remove the obsolete assignment so the configure-time default is used,
> including when honoring an explicit --disable-fixincludes.
> 
> gcc/ChangeLog:
> 
> 	* config/mingw/t-cygming: Remove obsolete STMP_FIXINC
> 	override.
> ---
> 
> Resubmitting because I forgot to CC anyone on my first submission.
> 
> I tested that this fixes the error I was seeing with --disable-fixincludes on
> x86_64-w64-mingw32.  There's still more small files left over related to
> fixincludes, but I don't think they are worth addressing in this patch (or the
> next release). That is probably not specific to mingw at all.
> 
>   gcc/config/mingw/t-cygming | 2 --
>   1 file changed, 2 deletions(-)
> 
> diff --git a/gcc/config/mingw/t-cygming b/gcc/config/mingw/t-cygming
> index be3323d143a..4d0f99797c3 100644
> --- a/gcc/config/mingw/t-cygming
> +++ b/gcc/config/mingw/t-cygming
> @@ -61,5 +61,3 @@ msformat-c.o: $(srcdir)/config/mingw/msformat-c.cc $(CONFIG_H) $(SYSTEM_H) \
>     $(TM_P_H) $(HASHTAB_H) $(GGC_H)
>   	$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
>   	$(srcdir)/config/mingw/msformat-c.cc
> -
> -STMP_FIXINC=stmp-fixinc

Thank you for the patch, this will make cygwin and mingw targets more 
consistent. I am OK with this change.

I will push this change to the master branch soon if nobody objects or 
does it first.
Jonathan Yong April 7, 2026, 1:39 p.m. UTC | #2 
On 4/5/26 01:15, Jonathan Yong wrote:
> On 4/5/26 00:41, Peter Damianov wrote:
>> Resubmitting because I forgot to CC anyone on my first submission.
>>
>> I tested that this fixes the error I was seeing with --disable- 
>> fixincludes on
>> x86_64-w64-mingw32.  There's still more small files left over related to
>> fixincludes, but I don't think they are worth addressing in this patch 
>> (or the
>> next release). That is probably not specific to mingw at all.
>>
>>   gcc/config/mingw/t-cygming | 2 --
>>   1 file changed, 2 deletions(-)
>>
>> diff --git a/gcc/config/mingw/t-cygming b/gcc/config/mingw/t-cygming
>> index be3323d143a..4d0f99797c3 100644
>> --- a/gcc/config/mingw/t-cygming
>> +++ b/gcc/config/mingw/t-cygming
>> @@ -61,5 +61,3 @@ msformat-c.o: $(srcdir)/config/mingw/msformat-c.cc 
>> $(CONFIG_H) $(SYSTEM_H) \
>>     $(TM_P_H) $(HASHTAB_H) $(GGC_H)
>>       $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
>>       $(srcdir)/config/mingw/msformat-c.cc
>> -
>> -STMP_FIXINC=stmp-fixinc
> 
> Thank you for the patch, this will make cygwin and mingw targets more 
> consistent. I am OK with this change.
> 
> I will push this change to the master branch soon if nobody objects or 
> does it first.
> 

Pushed to master branch, thanks.
diff mbox series

Patch

diff --git a/gcc/config/mingw/t-cygming b/gcc/config/mingw/t-cygming
index be3323d143a..4d0f99797c3 100644
--- a/gcc/config/mingw/t-cygming
+++ b/gcc/config/mingw/t-cygming
@@ -61,5 +61,3 @@  msformat-c.o: $(srcdir)/config/mingw/msformat-c.cc $(CONFIG_H) $(SYSTEM_H) \
   $(TM_P_H) $(HASHTAB_H) $(GGC_H)
 	$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
 	$(srcdir)/config/mingw/msformat-c.cc
-
-STMP_FIXINC=stmp-fixinc