Patchwork Fix libgcc version for Canadian cross compile

login
register
mail settings
Submitter H.J. Lu
Date Aug. 4, 2012, 5:38 a.m.
Message ID <CAMe9rOrvYWJbNPT5hMta_c2roujgXU8WSfchq4k=zv6tw6n_6Q@mail.gmail.com>
Download mbox | patch
Permalink /patch/175074/
State New
Headers show

Comments

H.J. Lu - Aug. 4, 2012, 5:38 a.m.
On Fri, Aug 3, 2012 at 10:36 PM, Ian Lance Taylor <iant@google.com> wrote:
> On Fri, Aug 3, 2012 at 10:24 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
>> On Fri, Aug 3, 2012 at 10:14 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
>>> On Fri, Aug 3, 2012 at 4:42 PM, Ian Lance Taylor <iant@google.com> wrote:
>>>> On Fri, Aug 3, 2012 at 9:04 AM, JonY <jon_y@users.sourceforge.net> wrote:
>>>>>
>>>>> OK. Btw, I don't actually have write access, so please commit if the
>>>>> ChangeLog is good.
>>>>>
>>>>> 2012-08-03  Jonathan Yong  <jon_y@users.sourceforge.net>
>>>>>
>>>>>         * Makefile.in (version): set to BASE-VER file from gcc
>>>>>         directory.
>>>>
>>>> Committed.
>>>
>>> This totally breaks the installed GCC:
>>>
>>> [hjl@gnu-35 tmp]$ cat x.c
>>> int
>>> main ()
>>> {
>>> }
>>> [hjl@gnu-35 tmp]$ /export/gnu/import/git/gcc-test-spec/usr/bin/gcc x.c
>>> /usr/local/bin/ld: cannot find crtbegin.o: No such file or directory
>>> /usr/local/bin/ld: cannot find -lgcc
>>> collect2: error: ld returned 1 exit status
>>> [hjl@gnu-35 tmp]$
>>>
>>> --
>>> H.J.
>>
>> top_srcdir is never defined in libgcc/Makefile.in.
>
> Thanks for fixing it.
>
> Ian

This is the patch I checked in.

Patch

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 391c9e7..73f7c95 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@ 
+2012-08-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR driver/54171
+	* Makefile.in (version): Replace top_srcdir with srcdir.
+
 2012-08-03  Jonathan Yong  <jon_y@users.sourceforge.net>

 	* Makefile.in (version): set to BASE-VER file from gcc directory.
diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
index fb7f9bd..4904a37 100644
--- a/libgcc/Makefile.in
+++ b/libgcc/Makefile.in
@@ -207,7 +207,7 @@  export slibdir
 export toolexecdir
 export toolexeclibdir

-version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+version := $(shell cat $(srcdir)/../gcc/BASE-VER)

 ifeq ($(decimal_float),yes)
 ifeq ($(enable_decimal_float),bid)