[libgcc,build] cater for static archives as 'extra parts'

Message ID	B303DD31-F2B7-42C3-816F-4C7659038ADE@sandoe-acoustics.co.uk
State	New
Headers	show Return-Path: <gcc-patches-return-273157-incoming=patchwork.ozlabs.org@gcc.gnu.org> Cc: GCC Patches <gcc-patches@gcc.gnu.org> Message-Id: <B303DD31-F2B7-42C3-816F-4C7659038ADE@sandoe-acoustics.co.uk> From: IainS <developer@sandoe-acoustics.co.uk> To: Paolo Bonzini <bonzini@gnu.org> In-Reply-To: <4C90EBC8.2040507@gnu.org> Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v936) Subject: Re: [Patch libgcc build] cater for static archives as 'extra parts' Date: Sat, 18 Sep 2010 16:32:06 +0100 References: <C630F665-A3CC-4F2A-A662-251B4FF2F39F@sandoe-acoustics.co.uk> <4C90EBC8.2040507@gnu.org> Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org

Message ID

B303DD31-F2B7-42C3-816F-4C7659038ADE@sandoe-acoustics.co.uk

State

New

Headers

Cc: GCC Patches <gcc-patches@gcc.gnu.org>
Message-Id: <B303DD31-F2B7-42C3-816F-4C7659038ADE@sandoe-acoustics.co.uk>
From: IainS <developer@sandoe-acoustics.co.uk>
To: Paolo Bonzini <bonzini@gnu.org>
In-Reply-To: <4C90EBC8.2040507@gnu.org>
Content-Type: text/plain; charset=US-ASCII; format=flowed
Content-Transfer-Encoding: 7bit
Mime-Version: 1.0 (Apple Message framework v936)
Subject: Re: [Patch libgcc build] cater for static archives as 'extra parts'
Date: Sat, 18 Sep 2010 16:32:06 +0100
References: <C630F665-A3CC-4F2A-A662-251B4FF2F39F@sandoe-acoustics.co.uk>
	<4C90EBC8.2040507@gnu.org>
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
Sender: gcc-patches-owner@gcc.gnu.org

Commit Message

Iain Sandoe Sept. 18, 2010, 3:32 p.m. UTC

On 15 Sep 2010, at 16:52, Paolo Bonzini wrote:

> On 09/15/2010 05:51 PM, IainS wrote:
>> Index: libgcc/Makefile.in
>> ===================================================================
>> --- libgcc/Makefile.in (revision 164304)
>> +++ libgcc/Makefile.in (working copy)
>> @@ -870,6 +870,9 @@ endif
>> for file in $$parts; do \
>> rm -f $(gcc_objdir)$(MULTISUBDIR)/$$file; \
>> $(INSTALL_DATA) $$file $(gcc_objdir)$(MULTISUBDIR)/; \
>> + if [ $${file##*.} = "a" ] ; then \
>> + $(RANLIB) $(gcc_objdir)$(MULTISUBDIR)/$$file; \
>> + fi; \
>
> Please use "case", ${file##*.} is a bashism.

Is this OK?
Iain

Comments

Paolo Bonzini Sept. 18, 2010, 7:43 p.m. UTC | #1

On 09/18/2010 05:32 PM, IainS wrote:
>
> On 15 Sep 2010, at 16:52, Paolo Bonzini wrote:
>
>> On 09/15/2010 05:51 PM, IainS wrote:
>>> Index: libgcc/Makefile.in
>>> ===================================================================
>>> --- libgcc/Makefile.in (revision 164304)
>>> +++ libgcc/Makefile.in (working copy)
>>> @@ -870,6 +870,9 @@ endif
>>> for file in $$parts; do \
>>> rm -f $(gcc_objdir)$(MULTISUBDIR)/$$file; \
>>> $(INSTALL_DATA) $$file $(gcc_objdir)$(MULTISUBDIR)/; \
>>> + if [ $${file##*.} = "a" ] ; then \
>>> + $(RANLIB) $(gcc_objdir)$(MULTISUBDIR)/$$file; \
>>> + fi; \
>>
>> Please use "case", ${file##*.} is a bashism.
>
> Is this OK?

Yes, thanks.

Paolo

Iain Sandoe Sept. 21, 2010, 2:45 p.m. UTC | #2

On 18 Sep 2010, at 20:43, Paolo Bonzini wrote:

> On 09/18/2010 05:32 PM, IainS wrote:
>>
>> On 15 Sep 2010, at 16:52, Paolo Bonzini wrote:
>>
>>> On 09/15/2010 05:51 PM, IainS wrote:
>>>> Index: libgcc/Makefile.in
>>>> ===================================================================
>>>> --- libgcc/Makefile.in (revision 164304)
>>>> +++ libgcc/Makefile.in (working copy)
>>>> @@ -870,6 +870,9 @@ endif
>>>> for file in $$parts; do \
>>>> rm -f $(gcc_objdir)$(MULTISUBDIR)/$$file; \
>>>> $(INSTALL_DATA) $$file $(gcc_objdir)$(MULTISUBDIR)/; \
>>>> + if [ $${file##*.} = "a" ] ; then \
>>>> + $(RANLIB) $(gcc_objdir)$(MULTISUBDIR)/$$file; \
>>>> + fi; \
>>>
>>> Please use "case", ${file##*.} is a bashism.
>>
>> Is this OK?
>
> Yes, thanks.

r164482
Iain

Index: libgcc/Makefile.in
===================================================================
--- libgcc/Makefile.in	(revision 164393)
+++ libgcc/Makefile.in	(working copy)
@@ -870,6 +870,10 @@  endif
  	for file in $$parts; do					\
  	  rm -f $(gcc_objdir)$(MULTISUBDIR)/$$file;		\
  	  $(INSTALL_DATA) $$file $(gcc_objdir)$(MULTISUBDIR)/;	\
+	  case $$file in 					\
+	    *.a)						\
+	      $(RANLIB) $(gcc_objdir)$(MULTISUBDIR)/$$file ;;	\
+	  esac;							\
  	done

  # Build extra startfiles in the gcc directory, for unconverted
@@ -903,6 +907,10 @@  gcc-extra-parts:
  	for file in $$parts; do					\
  	  rm -f $(gcc_objdir)$(MULTISUBDIR)/$$file;		\
  	  $(INSTALL_DATA) $$file $(gcc_objdir)$(MULTISUBDIR)/;	\
+	  case $$file in 					\
+	    *.a)						\
+	      $(RANLIB) $(gcc_objdir)$(MULTISUBDIR)/$$file ;;	\
+	  esac;							\
  	done

  all: $(extra-parts)
@@ -958,6 +966,10 @@  install-leaf: $(install-shared) $(install-libunwin
  	for file in $$parts; do					\
  	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
  	  $(INSTALL_DATA) $$file $(DESTDIR)$(inst_libdir)/;	\
+	  case $$file in 					\
+	    *.a)						\
+	      $(RANLIB) $(gcc_objdir)$(MULTISUBDIR)/$$file ;;	\
+	  esac;							\
  	done

  install: install-leaf