d: respect --enable-link-mutex configure option

Message ID f680ae3e-7819-22e0-ca83-72c98135e034@suse.cz
State New
Headers
Series d: respect --enable-link-mutex configure option |

Commit Message

Martin Liška Nov. 22, 2022, 9:41 a.m. UTC
  I noticed the option is ignored because @DO_LINK_MUTEX@
is not defined in d/Make-lang.in.

Tested locally before and after the patch.

Ready to be installed?
Thanks,
Martin

gcc/ChangeLog:

	* Makefile.in: Set DO_LINK_MUTEX.

gcc/d/ChangeLog:

	* Make-lang.in: Use it as $DO_LINK_MUTEX.
---
 gcc/Makefile.in    | 1 +
 gcc/d/Make-lang.in | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
  

Comments

Iain Buclaw Nov. 22, 2022, 12:59 p.m. UTC | #1
Excerpts from Martin Liška's message of November 22, 2022 10:41 am:
> I noticed the option is ignored because @DO_LINK_MUTEX@
> is not defined in d/Make-lang.in.
> 
> Tested locally before and after the patch.
> 
> Ready to be installed?
> Thanks,
> Martin
> 

Fine on my end.  Thanks!

Iain.
  
Martin Liška Nov. 23, 2022, 1:20 p.m. UTC | #2
On 11/22/22 13:59, Iain Buclaw wrote:
> Excerpts from Martin Liška's message of November 22, 2022 10:41 am:
>> I noticed the option is ignored because @DO_LINK_MUTEX@
>> is not defined in d/Make-lang.in.
>>
>> Tested locally before and after the patch.
>>
>> Ready to be installed?
>> Thanks,
>> Martin
>>
> 
> Fine on my end.  Thanks!

Done, pushed as r13-4264-g52a0ef696e1d78.

Martin

> 
> Iain.
  

Patch

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 5ad638f59d8..c57d62229ee 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -272,6 +272,7 @@  COMPILER += $(CET_HOST_FLAGS)
 
 NO_PIE_CFLAGS = @NO_PIE_CFLAGS@
 NO_PIE_FLAG = @NO_PIE_FLAG@
+DO_LINK_MUTEX = @DO_LINK_MUTEX@
 
 # We don't want to compile the compilers with -fPIE, it make PCH fail.
 COMPILER += $(NO_PIE_CFLAGS)
diff --git a/gcc/d/Make-lang.in b/gcc/d/Make-lang.in
index 6f9b2e5c26a..984b1d63dcb 100644
--- a/gcc/d/Make-lang.in
+++ b/gcc/d/Make-lang.in
@@ -70,7 +70,7 @@  DPOSTCOMPILE = @mv $(@D)/$(DEPDIR)/$(*F).TPo $(@D)/$(DEPDIR)/$(*F).Po
 DLINKER = $(GDC) $(NO_PIE_FLAG) -lstdc++
 
 # Like LINKER, but use a mutex for serializing front end links.
-ifeq (@DO_LINK_MUTEX@,true)
+ifeq ($(DO_LINK_MUTEX),true)
 DLLINKER = $(SHELL) $(srcdir)/lock-and-run.sh linkfe.lck $(DLINKER)
 else
 DLLINKER = $(DLINKER)